Fix ping functionality when activated as component (thank you Guus and MattJ). Add initial code for XEP-0060: Publish-Subscribe. Fix case-sensitivity with setting keys sent in-chat-command (Thank you mirux)
93 lines
2.7 KiB
Python
93 lines
2.7 KiB
Python
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
|
|
import logging
|
|
import os
|
|
# import slixfeed.action as action
|
|
import slixfeed.config as config
|
|
from slixfeed.dt import current_time, timestamp
|
|
import slixfeed.fetch as fetch
|
|
import slixfeed.sqlite as sqlite
|
|
import slixfeed.task as task
|
|
import slixfeed.url as uri
|
|
from slixfeed.xmpp.bookmark import XmppBookmark
|
|
# from slixfeed.xmpp.muc import XmppGroupchat
|
|
# from slixfeed.xmpp.message import XmppMessage
|
|
from slixfeed.xmpp.presence import XmppPresence
|
|
from slixfeed.xmpp.upload import XmppUpload
|
|
from slixfeed.xmpp.utility import get_chat_type
|
|
import time
|
|
import xml.sax.saxutils as saxutils
|
|
|
|
"""
|
|
|
|
NOTE
|
|
|
|
See XEP-0367: Message Attaching
|
|
|
|
"""
|
|
|
|
class XmppMessage:
|
|
|
|
|
|
# def process():
|
|
|
|
|
|
def send(self, jid, message_body, chat_type):
|
|
jid_from = str(self.boundjid) if self.is_component else None
|
|
self.send_message(mto=jid,
|
|
mfrom=jid_from,
|
|
mbody=message_body,
|
|
mtype=chat_type)
|
|
|
|
|
|
def send_headline(self, jid, message_subject, message_body, chat_type):
|
|
jid_from = str(self.boundjid) if self.is_component else None
|
|
self.send_message(mto=jid,
|
|
mfrom=jid_from,
|
|
# mtype='headline',
|
|
msubject=message_subject,
|
|
mbody=message_body,
|
|
mtype=chat_type,
|
|
mnick=self.alias)
|
|
|
|
|
|
# NOTE We might want to add more characters
|
|
# def escape_to_xml(raw_string):
|
|
# escape_map = {
|
|
# '"' : '"',
|
|
# "'" : '''
|
|
# }
|
|
# return saxutils.escape(raw_string, escape_map)
|
|
def send_oob(self, jid, url, chat_type):
|
|
jid_from = str(self.boundjid) if self.is_component else None
|
|
url = saxutils.escape(url)
|
|
# try:
|
|
html = (
|
|
f'<body xmlns="http://www.w3.org/1999/xhtml">'
|
|
f'<a href="{url}">{url}</a></body>')
|
|
message = self.make_message(mto=jid,
|
|
mfrom=jid_from,
|
|
mbody=url,
|
|
mhtml=html,
|
|
mtype=chat_type)
|
|
message['oob']['url'] = url
|
|
message.send()
|
|
# except:
|
|
# logging.error('ERROR!')
|
|
# logging.error(jid, url, chat_type, html)
|
|
|
|
|
|
# FIXME Solve this function
|
|
def send_oob_reply_message(message, url, response):
|
|
reply = message.reply(response)
|
|
reply['oob']['url'] = url
|
|
reply.send()
|
|
|
|
|
|
# def send_reply(self, message, message_body):
|
|
# message.reply(message_body).send()
|
|
|
|
|
|
def send_reply(self, message, response):
|
|
message.reply(response).send()
|