*: fix sub for clash

apps/api/views.py

@@ -91,7 +91,9 @@ def get(self, request):
         return HttpResponse(
             sub_info,
             content_type="text/plain; charset=utf-8",
-            headers=user.get_sub_info_header(),
+            headers=user.get_sub_info_header(
+                for_android=sub_client != UserSubManager.CLIENT_SHADOWROCKET
+            ),
         )
 
 

apps/sspanel/models.py

@@ -278,11 +278,14 @@ def reset_to_fresh(self):
         self.reset_traffic(settings.DEFAULT_TRAFFIC)
         self.save()
 
-    def get_sub_info_header(self):
+    def get_sub_info_header(self, for_android=False):
         """
         https://github.com/crossutility/Quantumult/blob/master/extra-subscription-feature.md
         """
-        expire = self.level_expire_time.date().strftime("%Y-%m-%d")
+        if for_android:
+            expire = self.level_expire_time.timestamp()
+        else:
+            expire = self.level_expire_time.date().strftime("%Y-%m-%d")
         info = f"u={traffic_format(self.upload_traffic)}; d={traffic_format(self.download_traffic)}; t={traffic_format(self.total_traffic)}; expire={expire}"
         return {"Subscription-Userinfo": info}
 

apps/sspanel/views.py

@@ -348,7 +348,9 @@ def post(self, request, pk):
         """添加回复"""
         ticket: Ticket = Ticket.objects.get(pk=pk)
         if ticket.status == -1:
-            messages.error(request, "工单已经关闭,请开启新的工单", extra_tags="回复失败")
+            messages.error(
+                request, "工单已经关闭,请开启新的工单", extra_tags="回复失败"
+            )
             return HttpResponseRedirect(reverse("sspanel:ticket_detail", args=(pk,)))
         ticket.updated_at = get_current_datetime()
         ticket.save()

templates/clash/main.yaml

@@ -45,4 +45,6 @@ proxy-providers:
 {% include "clash/rules.yaml" %}
 {% else %}
 {% include "clash/rule_sets.yaml" %}
+{% endif %}
+