X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorealiasmanager.cpp;h=f75dd3c6d99d1e6f8b7a075731129c8766eaa46f;hp=af3353fd7ca37238b18d5c458fd044c5feac2a88;hb=d36b7f8ed6ec4474492c60e3c16b3d6755630e3c;hpb=f7eb3911860f30e6bccce3c77d03fc25e87d7f93

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index af3353fd..f75dd3c6 100644
--- a/src/core/corealiasmanager.cpp
+++ b/src/core/corealiasmanager.cpp
@@ -34,11 +34,9 @@ CoreAliasManager::CoreAliasManager(CoreSession *parent)
   }
 
   QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
-  if(aliases.isEmpty()) {
+  initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+  if(isEmpty())
     loadDefaults();
-  } else {
-    initSetAliases(aliases);
-  }
 }
 
 
@@ -54,5 +52,14 @@ CoreAliasManager::~CoreAliasManager() {
 
 void CoreAliasManager::loadDefaults() {
   // Default Aliases:
-  addAlias("j", "/join #$1");
+  addAlias("j", "/join $0");
+
+  addAlias("ns", "/msg nickserv $0");
+  addAlias("nickserv", "/msg nickserv $0");
+  addAlias("cs", "/msg chanserv $0");
+  addAlias("chanserv",  "/msg chanserv $0");
+  addAlias("hs", "/msg hostserv $0");
+  addAlias("hostserv", "/msg hostserv $0");
+
+  addAlias("back", "/quote away");
 }