Fix send message logic and tweak context queries for private messages
This commit is contained in:
@@ -104,7 +104,11 @@ class ThresholdIRCNetworkRelays(SuperUserRequiredMixin, View):
|
||||
|
||||
def get(self, request, net):
|
||||
relays = threshold.get_irc_relays(net)
|
||||
sinst = threshold.get_irc_sinst(net)
|
||||
context = {"net": net, "relays": relays["relays"]}
|
||||
if sinst:
|
||||
if sinst["success"]:
|
||||
context["sinst"] = sinst["sinst"]
|
||||
return render(request, self.template_name, context)
|
||||
|
||||
|
||||
@@ -693,7 +697,7 @@ class ThresholdIRCSendMessage(SuperUserRequiredMixin, APIView):
|
||||
parser_classes = [FormParser]
|
||||
template_name = "partials/context-input.html"
|
||||
|
||||
def put(self, request, net, num, nick=None):
|
||||
def put(self, request, net, num):
|
||||
"""
|
||||
Send a message
|
||||
"""
|
||||
@@ -713,6 +717,9 @@ class ThresholdIRCSendMessage(SuperUserRequiredMixin, APIView):
|
||||
self.template_name,
|
||||
{"message": message, "class": message_class},
|
||||
)
|
||||
nick = None
|
||||
if "nick" in request.data:
|
||||
nick = request.data["nick"]
|
||||
if nick:
|
||||
messaged = threshold.send_irc_message(
|
||||
net, num, request.data["channel"], request.data["msg"], nick=nick
|
||||
|
||||
Reference in New Issue
Block a user