eleksir/isida-4
1
Fork 0
Code Activity

fix: replace site name

Browse Source
This commit is contained in:
diSabler
2017-02-25 10:20:44 +03:00
parent 2d0c0abd30
commit ff7efea49b
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -6,9 +6,9 @@ What's new?
* Developer tools are included. * Developer tools are included.
More info: More info:
* Official [site](http://isida-bot.com) * Official [site](http://isida.dsy.name)
* Information about Installation or Update at [WIKI](http://isida-bot.com/wiki) * Information about Installation or Update at [WIKI](http://isida.dsy.name/wiki)
* Xmpp conference: isida@conference.jabber.ru or sup@muc.isida-bot.com * Xmpp conference: isida@conference.jabber.ru
------ ------

6
isida.py
View File

@@ -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')) 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) os.system('git log -1 > %s' % updatelog_file)
writefile(updatelog_file, unicode(readfile(updatelog_file)).replace('\n\n','\n').replace('\r','').replace('\t','')) 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 __name__ == "__main__":
if os.name == 'nt': printlog('Warning! Correct work only on *NIX system!') if os.name == 'nt': printlog('Warning! Correct work only on *NIX system!')
try: writefile(starttime_file,str(int(time.time()))) try: writefile(starttime_file,str(int(time.time())))
except: except:
printlog(crashtext('Isida is crashed! Incorrent launch!')) printlog(crashtext('iSida is crashed! Incorrent launch!'))
raise raise
if os.path.isfile(pid_file) and os.name != 'nt': if os.path.isfile(pid_file) and os.name != 'nt':
@@ -152,7 +152,7 @@ if __name__ == "__main__":
except Exception, SM: except Exception, SM:
try: SM = str(SM) try: SM = str(SM)
except: SM = unicode(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) printlog('%s\n' % SM)
traceback.print_exc() traceback.print_exc()
break break

6
kernel.py
View File

@@ -677,7 +677,7 @@ def paste_text_raw(text,room,jid,need_replace):
ott = onlytimeadd(tuple(time.localtime())) ott = onlytimeadd(tuple(time.localtime()))
paste_body = ['%s','<p><span class="paste">%s</span></p>\n'][_html_paste] % (text) paste_body = ['%s','<p><span class="paste">%s</span></p>\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]) 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</title></head><body><div class="main"><div class="top"><div class="heart"><a href="http://isida-bot.com">http://isida-bot.com</a></div><div class="conference">%s</div></div><div class="container">\n' % (paste_header,lht,lht)][_html_paste] paste_he = ['%s\t\thttp://isida.dsy.name\n\n' % lht,'%s%s</title></head><body><div class="main"><div class="top"><div class="heart"><a href="http://isida.dsy.name">http://isida.dsy.name</a></div><div class="conference">%s</div></div><div class="container">\n' % (paste_header,lht,lht)][_html_paste]
fl = open(pastepath+url, 'a') fl = open(pastepath+url, 'a')
fl.write(paste_he.encode('utf-8')) fl.write(paste_he.encode('utf-8'))
fl.write(paste_body.encode('utf-8')) fl.write(paste_body.encode('utf-8'))
@@ -1574,7 +1574,7 @@ prefix = '_' # префикс комманд
msg_limit = 1000 # лимит размера сообщений msg_limit = 1000 # лимит размера сообщений
botName = 'iSida' # название бота botName = 'iSida' # название бота
botVersionDef = u'4.0' # версия бота botVersionDef = u'4.0' # версия бота
disco_config_node = 'http://isida-bot.com/config' disco_config_node = 'http://isida.dsy.name/config'
pres_answer = [] # результаты посылки презенсов pres_answer = [] # результаты посылки презенсов
iq_request = {} # iq запросы iq_request = {} # iq запросы
th_cnt = 0 # счётчик тредов th_cnt = 0 # счётчик тредов
@@ -1724,7 +1724,7 @@ if os.path.isdir(sm_f):
else: smiles_dirs, smiles_dirs_case = [], [] else: smiles_dirs, smiles_dirs_case = [], []
logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,) # включение логгирования logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG,) # включение логгирования
capsNode = 'http://v4.isida-bot.com' capsNode = 'http://v4.isida.dsy.name'
god = SuperAdmin.lower() god = SuperAdmin.lower()
pprint('-'*50,'blue') pprint('-'*50,'blue')

2
plugins/adminmail.py
View File

@@ -5,7 +5,7 @@
# # # #
# Plugin for iSida Jabber Bot # # Plugin for iSida Jabber Bot #
# Copyright (C) diSabler <dsy@dsy.name> # # Copyright (C) diSabler <dsy@dsy.name> #
# Copyright (C) dr.Schmurge <dr.schmurge@isida-bot.com> # # Copyright (C) dr.Schmurge <dr.schmurge@isida.dsy.name> #
# # # #
# This program is free software: you can redistribute it and/or modify # # 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 # # it under the terms of the GNU General Public License as published by #

2
plugins/calendar.py
View File

@@ -5,7 +5,7 @@
# # # #
# Plugin for iSida Jabber Bot # # Plugin for iSida Jabber Bot #
# Copyright (C) diSabler <dsy@dsy.name> # # Copyright (C) diSabler <dsy@dsy.name> #
# Copyright (C) dr.Schmurge <dr.schmurge@isida-bot.com> # # Copyright (C) dr.Schmurge <dr.schmurge@isida.dsy.name> #
# # # #
# This program is free software: you can redistribute it and/or modify # # 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 # # it under the terms of the GNU General Public License as published by #

4
plugins/logger.py
View File

@@ -135,7 +135,7 @@ def msg_logger(room,jid,nick,type,text,logfile):
else: msg_type = '<span class="nick">%s:&nbsp;</span><span class="text">%s</span></p>\n' else: msg_type = '<span class="nick">%s:&nbsp;</span><span class="text">%s</span></p>\n'
log_body += ['%s: %s\n',msg_type][GT('html_logs_enable')] % (nick,text) 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]) 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+'</title></head><body><div class="main"><div class="top"><div class="heart"><a href="http://isida-bot.com">http://isida-bot.com</a></div><div class="conference">'+lht+'</div></div><div class="container">\n'][GT('html_logs_enable')] log_he = ['%s\t\thttp://isida.dsy.name\n\n' % lht,log_header+lht+'</title></head><body><div class="main"><div class="top"><div class="heart"><a href="http://isida.dsy.name">http://isida.dsy.name</a></div><div class="conference">'+lht+'</div></div><div class="container">\n'][GT('html_logs_enable')]
try: log_he += initial_log_users(room,ott) + ['[%s] ' % ott,'<p><a id="%s" name="%s" href="#%s" class="time">%s</a> ' % (ott,ott,ott,ott)][GT('html_logs_enable')] + ['*** %s\n','<span class="topic">%s</span></p>'][GT('html_logs_enable')] % [topics[room],html_escape(topics[room]).replace('\n','<br/>')][GT('html_logs_enable')] try: log_he += initial_log_users(room,ott) + ['[%s] ' % ott,'<p><a id="%s" name="%s" href="#%s" class="time">%s</a> ' % (ott,ott,ott,ott)][GT('html_logs_enable')] + ['*** %s\n','<span class="topic">%s</span></p>'][GT('html_logs_enable')] % [topics[room],html_escape(topics[room]).replace('\n','<br/>')][GT('html_logs_enable')]
except: pass except: pass
write_log_with_end(logfile+room,curr_file,log_body,log_he) 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 if text != 'None': log_body += ' (%s)' % text
log_body += '%s\n' % ['','</span></p>'][GT('html_logs_enable')] log_body += '%s\n' % ['','</span></p>'][GT('html_logs_enable')]
lht = '%s - %02d/%02d/%02d' % (room,lt[0],lt[1],lt[2]) 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+'</title></head><body><div class="main"><div class="top"><div class="heart"><a href="http://isida-bot.com">http://isida-bot.com</a></div><div class="conference">'+lht+'</div></div><div class="container">\n'][GT('html_logs_enable')] log_he = ['%s\t\thttp://isida.dsy.name\n\n' % lht,log_header+lht+'</title></head><body><div class="main"><div class="top"><div class="heart"><a href="http://isida.dsy.name">http://isida.dsy.name</a></div><div class="conference">'+lht+'</div></div><div class="container">\n'][GT('html_logs_enable')]
try: log_he += initial_log_users(room,ott) + ['[%s] ' % ott,'<p><a id="%s" name="%s" href="#%s" class="time">%s</a> ' % (ott,ott,ott,ott)][GT('html_logs_enable')] + ['*** %s\n','<span class="topic">%s</span></p>'][GT('html_logs_enable')] % [topics[room],html_escape(topics[room]).replace('\n','<br/>')][GT('html_logs_enable')] try: log_he += initial_log_users(room,ott) + ['[%s] ' % ott,'<p><a id="%s" name="%s" href="#%s" class="time">%s</a> ' % (ott,ott,ott,ott)][GT('html_logs_enable')] + ['*** %s\n','<span class="topic">%s</span></p>'][GT('html_logs_enable')] % [topics[room],html_escape(topics[room]).replace('\n','<br/>')][GT('html_logs_enable')]
except: pass except: pass
write_log_with_end(logfile+room,curr_file,log_body,log_he) write_log_with_end(logfile+room,curr_file,log_body,log_he)

4
plugins/main.py
View File

@@ -664,7 +664,7 @@ def info_comm(type, jid, nick):
def helpme(type, jid, nick, text): def helpme(type, jid, nick, text):
text = text.strip().lower() 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 ['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 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: elif len(text) > 1:
@@ -687,7 +687,7 @@ def helpme(type, jid, nick, text):
for tmp in tm: for tmp in tm:
if tmp[0] == i and tmp[2] != '': tmsg.append(unicode(tmp[1])) if tmp[0] == i and tmp[2] != '': tmsg.append(unicode(tmp[1]))
if len(tmsg): msg += u'[%s]…%s\n' % (i,', '.join(tmsg)) 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) send_msg(type, jid, nick, msg)
def bot_rejoin(type, jid, nick, text): def bot_rejoin(type, jid, nick, text):