diff --git a/README.md b/README.md index ee4634f..e902681 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ What's new? * Developer tools are included. More info: -* Official [site](http://isida-bot.com) -* Information about Installation or Update at [WIKI](http://isida-bot.com/wiki) -* Xmpp conference: isida@conference.jabber.ru or sup@muc.isida-bot.com +* Official [site](http://isida.dsy.name) +* Information about Installation or Update at [WIKI](http://isida.dsy.name/wiki) +* Xmpp conference: isida@conference.jabber.ru ------ diff --git a/isida.py b/isida.py index 5d013d2..db94e3e 100644 --- a/isida.py +++ b/isida.py @@ -93,14 +93,14 @@ def update(USED_REPO): writefile(ver_file, unicode(git_ver_format % (os.path.getsize(ver_file)+1,revno,id_append)).encode('utf-8')) os.system('git log -1 > %s' % updatelog_file) writefile(updatelog_file, unicode(readfile(updatelog_file)).replace('\n\n','\n').replace('\r','').replace('\t','')) - else: os.system('echo Update not available! Read wiki at http://isida-bot.com to use SVN/GIT! > %s' % updatelog_file) + else: os.system('echo Update not available! Read wiki at http://isida.dsy.name to use SVN/GIT! > %s' % updatelog_file) if __name__ == "__main__": if os.name == 'nt': printlog('Warning! Correct work only on *NIX system!') try: writefile(starttime_file,str(int(time.time()))) except: - printlog(crashtext('Isida is crashed! Incorrent launch!')) + printlog(crashtext('iSida is crashed! Incorrent launch!')) raise if os.path.isfile(pid_file) and os.name != 'nt': @@ -152,7 +152,7 @@ if __name__ == "__main__": except Exception, SM: try: SM = str(SM) except: SM = unicode(SM) - printlog(crashtext('Isida is crashed! It\'s imposible, but You do it!')) + printlog(crashtext('iSida is crashed! It\'s imposible, but You do it!')) printlog('%s\n' % SM) traceback.print_exc() break diff --git a/kernel.py b/kernel.py index 9f7f8c0..576b2ea 100644 --- a/kernel.py +++ b/kernel.py @@ -677,7 +677,7 @@ def paste_text_raw(text,room,jid,need_replace): ott = onlytimeadd(tuple(time.localtime())) paste_body = ['%s','

%s

\n'][_html_paste] % (text) lht = '%s [%s] - %02d/%02d/%02d %02d:%02d:%02d' % (nick,room,lt[0],lt[1],lt[2],lt[3],lt[4],lt[5]) - paste_he = ['%s\t\thttp://isida-bot.com\n\n' % lht,'%s%s
http://isida-bot.com
%s
\n' % (paste_header,lht,lht)][_html_paste] + paste_he = ['%s\t\thttp://isida.dsy.name\n\n' % lht,'%s%s
http://isida.dsy.name
%s
\n' % (paste_header,lht,lht)][_html_paste] fl = open(pastepath+url, 'a') fl.write(paste_he.encode('utf-8')) fl.write(paste_body.encode('utf-8')) @@ -1574,7 +1574,7 @@ prefix = '_' # префикс комманд msg_limit = 1000 # лимит размера сообщений botName = 'iSida' # название бота botVersionDef = u'4.0' # версия бота -disco_config_node = 'http://isida-bot.com/config' +disco_config_node = 'http://isida.dsy.name/config' pres_answer = [] # результаты посылки презенсов iq_request = {} # iq запросы th_cnt = 0 # счётчик тредов @@ -1724,7 +1724,7 @@ if os.path.isdir(sm_f): else: smiles_dirs, smiles_dirs_case = [], [] logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,) # включение логгирования -capsNode = 'http://v4.isida-bot.com' +capsNode = 'http://v4.isida.dsy.name' god = SuperAdmin.lower() pprint('-'*50,'blue') diff --git a/plugins/adminmail.py b/plugins/adminmail.py index c960f57..8f7d46f 100644 --- a/plugins/adminmail.py +++ b/plugins/adminmail.py @@ -5,7 +5,7 @@ # # # Plugin for iSida Jabber Bot # # Copyright (C) diSabler # -# Copyright (C) dr.Schmurge # +# Copyright (C) dr.Schmurge # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/plugins/calendar.py b/plugins/calendar.py index 8151b5b..82d74f0 100644 --- a/plugins/calendar.py +++ b/plugins/calendar.py @@ -5,7 +5,7 @@ # # # Plugin for iSida Jabber Bot # # Copyright (C) diSabler # -# Copyright (C) dr.Schmurge # +# Copyright (C) dr.Schmurge # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/plugins/logger.py b/plugins/logger.py index 556048e..5ae7c3b 100644 --- a/plugins/logger.py +++ b/plugins/logger.py @@ -135,7 +135,7 @@ def msg_logger(room,jid,nick,type,text,logfile): else: msg_type = '%s: %s

\n' log_body += ['%s: %s\n',msg_type][GT('html_logs_enable')] % (nick,text) lht = '%s - %02d/%02d/%02d' % (room,lt[0],lt[1],lt[2]) - log_he = ['%s\t\thttp://isida-bot.com\n\n' % lht,log_header+lht+'
http://isida-bot.com
'+lht+'
\n'][GT('html_logs_enable')] + log_he = ['%s\t\thttp://isida.dsy.name\n\n' % lht,log_header+lht+'
http://isida.dsy.name
'+lht+'
\n'][GT('html_logs_enable')] try: log_he += initial_log_users(room,ott) + ['[%s] ' % ott,'

%s ' % (ott,ott,ott,ott)][GT('html_logs_enable')] + ['*** %s\n','%s

'][GT('html_logs_enable')] % [topics[room],html_escape(topics[room]).replace('\n','
')][GT('html_logs_enable')] except: pass write_log_with_end(logfile+room,curr_file,log_body,log_he) @@ -203,7 +203,7 @@ def presence_logger(room,jid,nick,type,mass,mode,logfile): if text != 'None': log_body += ' (%s)' % text log_body += '%s\n' % ['','

'][GT('html_logs_enable')] lht = '%s - %02d/%02d/%02d' % (room,lt[0],lt[1],lt[2]) - log_he = ['%s\t\thttp://isida-bot.com\n\n' % lht,log_header+lht+'
http://isida-bot.com
'+lht+'
\n'][GT('html_logs_enable')] + log_he = ['%s\t\thttp://isida.dsy.name\n\n' % lht,log_header+lht+'
http://isida.dsy.name
'+lht+'
\n'][GT('html_logs_enable')] try: log_he += initial_log_users(room,ott) + ['[%s] ' % ott,'

%s ' % (ott,ott,ott,ott)][GT('html_logs_enable')] + ['*** %s\n','%s

'][GT('html_logs_enable')] % [topics[room],html_escape(topics[room]).replace('\n','
')][GT('html_logs_enable')] except: pass write_log_with_end(logfile+room,curr_file,log_body,log_he) diff --git a/plugins/main.py b/plugins/main.py index f65300c..56feed6 100644 --- a/plugins/main.py +++ b/plugins/main.py @@ -664,7 +664,7 @@ def info_comm(type, jid, nick): def helpme(type, jid, nick, text): text = text.strip().lower() - if text == 'about': msg = u'Isida Jabber Bot | © 2oo9-%s Disabler Production Lab. | http://isida-bot.com' % str(time.localtime()[0]).replace('0','o') + if text == 'about': msg = u'iSida Jabber Bot | © 2oo9-%s Disabler Production Lab. | http://isida.dsy.name' % str(time.localtime()[0]).replace('0','o') elif text in ['donation','donations']: msg = L('Send donation to: %sBest regards, %s','%s/%s'%(jid,nick)) % ('\nYandexMoney: 41001384336826\nWMZ: Z392970180590\nWMR: R378494692310\nWME: E164241657651\n','Disabler') elif text in [L('access','%s/%s'%(jid,nick)),'access']: msg = L('Bot has next access levels:\n-1 - ignored\n0 - minimal access\n1 - at least visitor and none\n2 - at least visitor and member\n3 - at least participant and none\n4 - at least participant and member\n5 - at least moderator and none\n6 - at least moderator and member\n7 - at least moderator and admin\n8 - at least moderator and owner\n9 - bot owner','%s/%s'%(jid,nick)) elif len(text) > 1: @@ -687,7 +687,7 @@ def helpme(type, jid, nick, text): for tmp in tm: if tmp[0] == i and tmp[2] != '': tmsg.append(unicode(tmp[1])) if len(tmsg): msg += u'[%s]…%s\n' % (i,', '.join(tmsg)) - else: msg = L('%s Help for command: help command | Commands list: commands','%s/%s'%(jid,nick)) % (u'Isida Jabber Bot | http://isida-bot.com | © 2oo9-'+str(time.localtime()[0]).replace('0','o')+' Disabler Production Lab. |') + else: msg = L('%s Help for command: help command | Commands list: commands','%s/%s'%(jid,nick)) % (u'iSida Jabber Bot | http://isida.dsy.name | © 2oo9-'+str(time.localtime()[0]).replace('0','o')+' Disabler Production Lab. |') send_msg(type, jid, nick, msg) def bot_rejoin(type, jid, nick, text):