Changeset 279:57864e38a85b

Timestamp:

06/15/2008 03:17:34 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

/global: Global aliases that can be accessed without "!" character

Location:

src/plugins/alias

Files:

• CMakeLists.txt (modified) (1 diff)
• alias.cpp (added)
• alias.h (added)
• aliaslist.cpp (modified) (3 diffs)
• aliaslist.h (modified) (2 diffs)
• aliasplugin.cpp (modified) (7 diffs)

src/plugins/alias/CMakeLists.txt

@@ -6 +6 @@
 
 set (plugin_HDR
+        alias.h
         aliaslist.h
 )
 
 set (plugin_SRC
+        alias.cpp
         aliaslist.cpp
         aliasplugin.cpp

src/plugins/alias/aliaslist.cpp

@@ -10 +10 @@
 }
 
-int AliasList::append(const StorageKey& storage, const QString& name, const QString& value)
+int AliasList::append(const StorageKey& storage, const Alias& alias)
 {
         if (!storage.isValid())
                 return 0;
         QSqlQuery query=DataStorage::instance()
-                ->prepareQuery("INSERT INTO aliases(plugin, storage, name, value) VALUES (?, ?, ?, ?)");
+                ->prepareQuery("INSERT INTO aliases(plugin, storage, global, name, value) VALUES (?, ?, ?, ?, ?)");
         query.addBindValue(storage.plugin());
         query.addBindValue(storage.storage());
-        query.addBindValue(name);
-        query.addBindValue(value);
+        query.addBindValue(alias.isGlobal());
+        query.addBindValue(alias.name());
+        query.addBindValue(alias.value());
         if (query.exec())
                 return 1;
         query.clear();
-        query.prepare("UPDATE aliases SET value=? WHERE plugin=? AND storage=? AND name=?");
-        query.addBindValue(value);
+        query.prepare("UPDATE aliases SET global=?, value=? WHERE plugin=? AND storage=? AND name=?");
+        query.addBindValue(alias.isGlobal());
+        query.addBindValue(alias.value());
         query.addBindValue(storage.plugin());
         query.addBindValue(storage.storage());
-        query.addBindValue(name);
+        query.addBindValue(alias.name());
         if (query.exec())
                 return 2;
@@ -33 +35 @@
 }
 
-QMap<QString,QString> AliasList::getAll(const StorageKey& storage)
+QMap<QString,Alias> AliasList::getAll(const StorageKey& storage)
 {
-        QMap<QString,QString> map;
+        QMap<QString,Alias> map;
         if (!storage.isValid())
                 return map;
         QSqlQuery query=DataStorage::instance()
-                ->prepareQuery("SELECT name, value FROM aliases WHERE plugin=? AND storage=?");
+                ->prepareQuery("SELECT global, name, value FROM aliases WHERE plugin=? AND storage=?");
         query.addBindValue(storage.plugin());
         query.addBindValue(storage.storage());
         query.exec();
         while (query.next())
-                map[query.value(0).toString()]=query.value(1).toString();
+        {
+                Alias alias(query.value(1).toString(),query.value(2).toString());
+                alias.setGlobal(query.value(0).toBool());
+                map[alias.name()]=alias;
+        }
         return map;
 }
 
-QString AliasList::get(const StorageKey& storage, const QString&name)
+Alias AliasList::get(const StorageKey& storage, const QString& name)
 {
         if (!storage.isValid())
-                return QString::null;
+                return Alias();
         QSqlQuery query=DataStorage::instance()
-                ->prepareQuery("SELECT value FROM aliases WHERE plugin=? AND storage=? AND name=?");
+                ->prepareQuery("SELECT global, value FROM aliases WHERE plugin=? AND storage=? AND name=?");
         query.addBindValue(storage.plugin());
         query.addBindValue(storage.storage());
@@ -59 +65 @@
         query.exec();
         if (!query.next())
-                return QString::null;
-        return query.value(0).toString();
+                return Alias();
+        Alias alias(name, query.value(1).toString());
+        alias.setGlobal(query.value(0).toBool());
+        return alias;
 }
 

src/plugins/alias/aliaslist.h

@@ -2 +2 @@
 #define ALIAS_LIST
 
+#include "alias.h"
 #include "base/config/storagekey.h"
 
@@ -14 +15 @@
         AliasList();
         // 0 - err, 1 - added, 2 - updated
-        int append(const StorageKey& storage, const QString& name, const QString& value);
-        QMap<QString,QString> getAll(const StorageKey& storage);
-        QString get(const StorageKey& storage, const QString&name);
+        int append(const StorageKey& storage, const Alias& alias);
+        QMap<QString,Alias> getAll(const StorageKey& storage);
+        Alias get(const StorageKey& storage, const QString&name);
         void clear(const StorageKey& storage);
         int count(const StorageKey& storage);

src/plugins/alias/aliasplugin.cpp

@@ -32 +32 @@
         if (s->hasAttribute("glooxbot_alias"))
                 return false;
-        bool res=MessageParser(s,getMyNick(s)).isForMe();
-        return res;
+        return true;
 }
 
@@ -44 +43 @@
                 return parseCommands(s);
 
-        QString res=aliases.get(bot()->getStorage(s), cmd);
+        Alias alias=aliases.get(bot()->getStorage(s), cmd);
+        
+        if (!parser.isForMe() && !alias.isGlobal())
+        {
+                myShouldIgnoreError=1;
+                return false;
+        }
+        
+        QString res=alias.value();
         QString firstArg=res.section(' ',0,0).toUpper();
 
@@ -115 +122 @@
                 {
                         QString res;
-                        QMap<QString, QString> all=aliases.getAll(bot()->getStorage(s));
+                        QMap<QString, Alias> all=aliases.getAll(bot()->getStorage(s));
                         int cnt=all.count();
                         if (!cnt)
@@ -123 +130 @@
                         }
                         for (int i=0; i<cnt; i++)
-                                res+=QString("\n%1) %2=%3").arg(i+1).arg(all.keys()[i].toLower()).arg(all.values()[i]);
+                                res+=QString("\n%1) %2%3=%4").arg(i+1).arg(all.values()[i].isGlobal() ? "[GLOBAL] ": "")
+                                        .arg(all.keys()[i].toLower()).arg(all.values()[i].value());
                         reply(s, QString("Aliases:%1").arg(res));
                         return true;
@@ -129 +137 @@
                 else
                 {
-                        QString value=aliases.get(bot()->getStorage(s),aliasName.toUpper());
+                        Alias alias=aliases.get(bot()->getStorage(s),aliasName.toUpper());
+                        QString value=alias.value();
                         if (!value.isNull())
-                                reply(s, QString("Alias: %1=%2").arg(aliasName).arg(value));
+                                reply(s, QString("Alias: %1%2=%3").arg(alias.isGlobal() ? "[GLOBAL] " : "")
+                                                .arg(aliasName).arg(value));
                         else
                                 reply(s, QString("No such alias: %1").arg(aliasName));
@@ -154 +164 @@
         if (cmd=="ADD")
         {
+                bool global=false;
+                const QString globalStr("/global ");
+                if (value.toLower().startsWith(globalStr))
+                {
+                        global=true;
+                        value=value.remove(0,globalStr.length()).trimmed();
+                }
                 if (name.isEmpty() || value.isEmpty())
                 {
@@ -161 +178 @@
                         return true;
                 }
-                int res=aliases.append(bot()->getStorage(s), name, value);
+                Alias alias(name, value);
+                alias.setGlobal(global);
+                int res=aliases.append(bot()->getStorage(s), alias);
                 switch (res)
                 {