Changeset 185

Timestamp:

03/21/08 22:54:40 (8 months ago)

Author:

Slynderdale

Message:

Fixes #18 Added recursive alias deleting. Now when a term is removed, all aliases pointing to that term will also be removed. Also added the ability to store more info about the lart including the hostmask of the person who added it and when it was added. A new command has been added 'lartinfo' that allows you to view information about a given term.

Files:

• trunk/Phergie/Plugin/Lart.php (modified) (12 diffs)

trunk/Phergie/Plugin/Lart.php

@@ -54 +54 @@
-    * @var PDOStatement
-    */
-
+
+
+
+
+
+
+
+
-
-    /**
@@ -62 +69 @@
-    */
-    protected $delete;
+
+    /**
+    * MAn array used to store recursive aliases for the getAliases function
+    *
+    * @var array
+    */
+    protected $aCache;
-
-    /**
@@ -74 +88 @@
-            // Initialize the database connection
-            $db = $this->dir . 'lart.db';
-            $create = !file_exists($db);
-            $this->db = new PDO('sqlite:' . $db);
-
+            // Check to see if the table exists
+            $table = $this->db
+                ->query('SELECT COUNT(*) FROM sqlite_master WHERE name = ' . $this->db->quote('lart'))
+                ->fetchColumn();
+
-            // Create database tables if necessary
-
+
+
-                $this->db->exec('
- name VARCHAR(255), definition TEXT 
+name VARCHAR(255), definition TEXT, hostmask VARCHAR(50), tstamp VARCHAR(19)
-                    CREATE UNIQUE INDEX lart_name ON lart (name)
-                ');
-            }
+            unset($table);
+
+            // Get the list of columns from the table
+            $table = $this->db
+                ->query('PRAGMA table_info('.$this->db->quote('lart').')')
+                ->fetchAll();
+
+            $columns = array();
+            foreach($table as $key => $column) {
+                $columns[] = $column['name'];
+            }
+
+            // Update table as neccessary
+            if (!in_array('hostmask', $columns)) {
+                $this->debug('Updating the databae schema');
+                $this->db->exec('
+                    BEGIN TRANSACTION;
+                    CREATE TEMPORARY TABLE lart_backup (name VARCHAR(255), definition TEXT);
+                    INSERT INTO lart_backup SELECT name, definition FROM lart;
+                    DROP TABLE lart;
+                    CREATE TABLE lart (name VARCHAR(255), definition TEXT, hostmask VARCHAR(50), tstamp VARCHAR(19));
+                    INSERT INTO lart SELECT name, definition, NULL, NULL FROM lart_backup;
+                    DROP TABLE lart_backup;
+                    COMMIT;
+                    CREATE UNIQUE INDEX lart_name ON lart (name)
+                ');
+            }
+            unset($table, $key, $column, $columns);
-
-            // Initialize prepared statements for common operations
-            $this->replace = $this->db->prepare('
-
+
+
+
+
+
+
+
-            ');
-            $this->select = $this->db->prepare('
-definition FROM lart WHERE name = :name
+* FROM lart WHERE LOWER(name) = LOWER(:name)
-            ');
-            $this->delete = $this->db->prepare('
-name = :name
+LOWER(name) = LOWER(:name)
-            ');
-        } catch (PDOException $e) { }
@@ -109 +162 @@
-    public static function checkDependencies(Phergie_Driver_Abstract $client, array $plugins)
-    {
- 
+
-            || !extension_loaded('pdo_sqlite')) {
-            return false;
@@ -128 +181 @@
-    {
-        if (!isset($this->cache[$term])) {
-select
-select
+defination
+defination
-            if ($definition) {
-                $this->cache[$term] = $definition;
@@ -140 +193 @@
-
-    /**
+    * Retrieves the alias for a given definition if it exists from the database
+    * and returns it otherwise return FALSE.
+    *
+    * @param string $term Term to search for
+    * @return mixed String containing the definition or FALSE if no alias exist
+    */
+    protected function getAlias($definition)
+    {
+        $this->alias->execute(array(':definition' => $definition));
+        $names = $this->alias->fetchAll();
+        if ($names && count($names) > 0) {
+            return $names;
+        } else {
+            return false;
+        }
+    }
+
+    /**
-    * Searches for a definition for a given term, resolves definition aliases,
-    * handles cases of circular references, and sends the definition back to
@@ -153 +224 @@
-        }
-
-        $message = strtolower($message);
-        $definition = $this->getDefinition($message);
-        $seen = array($message);
@@ -161 +231 @@
-                $redirect = $this->getDefinition($definition);
-                if ($redirect) {
-$definition
+strtolower($definition)
-                    if (in_array($redirect, $seen)) {
+                        $this->debug('Alias redirection loop detected');
+                        $this->deleteLart($message);
-                        $mod = $this->getIni('gender') == 'F' ? 'her' : 'his';
-                        foreach ($seen as $term) {
-                            $this->delete->execute(array('name' => $term));
-                        }
-                        $this->doAction(
-                            $this->event->getArgument(0),
@@ -177 +246 @@
-            } while($redirect);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        if (!$this->db) {
@@ -192 +327 @@
-        }
-
-        $this->checkLart($this->event->getArgument(1));
-    }
-
-    /**
-    * Performs a lookup for the contents of messages to the bot or a channel
-    * in which the bot is present.
-    *
-    * @return void
-    */
-    public function onPrivmsg()
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        $source = $this->event->getArgument(0);
-        $message = $this->event->getArgument(1);
-
+
+
+
-        $today = date('md');
-
@@ -218 +340 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            list (, $address, $name, $definition) = $match;
-
-
-
+
+
+
+
+
+
-                $this->cache[$name] = $definition;
-            }
-:?\s*)?forget 
+\s*:?\s+)?forget\s+
-            list (, $address, $name) = $match;
-empty ($address) xor $source[0] == '#'
-strtolower($name
-
-unset($this->cache[$name]
+!empty($name) && (empty($address) xor $source[0] == '#')
+trim(strtolower($name)
+
+$this->deleteLart($name
-            }
-        } else {
@@ -236 +380 @@
-        }
-    }
+
+    /**
+    * Performs a lookup for the contents of CTCP ACTION (/me) commands.
+    *
+    * @return void
+    */
+    public function onAction()
+    {
+        if (!$this->db) {
+            return;
+        }
+
+        $this->checkLart('/me ' . $this->event->getArgument(1));
+    }
-}