From a18289b5e4807c3702c28df2e9320e7f0d6cbbae Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Wed, 14 Oct 2020 13:04:29 +0200
Subject: [PATCH] Changes done directly in deployed_20200928_pure branch
delivered to develop. Changes originally done in commits:
5d87238e372eeee0e107f20c1266f6fde3481657
fc824f05fd0f92e757af9d3d9b54a50858018ce3
c772c5c66f55953ec8cd11030334c4f437c60267
---
hive/db/sql_scripts/hive_posts_base_view.sql | 2 +-
hive/server/common/mutes.py | 9 ++++++++-
hive/server/condenser_api/get_state.py | 2 +-
tests/tests_api | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/hive/db/sql_scripts/hive_posts_base_view.sql b/hive/db/sql_scripts/hive_posts_base_view.sql
index 024291a52..746aeeb0b 100644
--- a/hive/db/sql_scripts/hive_posts_base_view.sql
+++ b/hive/db/sql_scripts/hive_posts_base_view.sql
@@ -20,7 +20,7 @@ CREATE OR REPLACE VIEW public.hive_posts_base_view
FROM hive_posts hp
;
-DROP VIEW IF EXISTS public.hive_posts_pp_view;
+DROP VIEW IF EXISTS public.hive_posts_pp_view CASCADE;
CREATE OR REPLACE VIEW public.hive_posts_pp_view
AS
diff --git a/hive/server/common/mutes.py b/hive/server/common/mutes.py
index c99cb71ce..019d09a81 100644
--- a/hive/server/common/mutes.py
+++ b/hive/server/common/mutes.py
@@ -3,6 +3,7 @@
import logging
from time import perf_counter as perf
from urllib.request import urlopen, Request
+from hive.db.adapter import Db
log = logging.getLogger(__name__)
@@ -64,7 +65,13 @@ class Mutes:
def load(self):
"""Reload all accounts from irredeemables endpoint and global lists."""
- # TODO: Refactor/remove this method
+ self.all_accounts.clear()
+ sql = "select id, name from hive_accounts"
+ db = Db.instance()
+ sql_result = db.query_all(sql)
+ for row in sql_result:
+ self.all_accounts[row['id']] = row['name']
+ self.fetched = perf()
@classmethod
def all(cls):
diff --git a/hive/server/condenser_api/get_state.py b/hive/server/condenser_api/get_state.py
index b3a3fa95f..c4454d50d 100644
--- a/hive/server/condenser_api/get_state.py
+++ b/hive/server/condenser_api/get_state.py
@@ -137,7 +137,7 @@ async def get_state(context, path: str):
assert not part[2], "unexpected discussion path part[2] %s" % path
sort = valid_sort(part[0])
tag = valid_tag(part[1].lower(), allow_empty=True)
- pids = await get_posts_by_given_sort(db, sort, '', '', 20, tag)
+ pids = await get_posts_by_given_sort(context, sort, '', '', 20, tag)
state['content'] = _keyed_posts(await load_posts(db, pids))
state['discussion_idx'] = {tag: {sort: list(state['content'].keys())}}
state['tag_idx'] = {'trending': await get_top_trending_tags_summary(context)}
diff --git a/tests/tests_api b/tests/tests_api
index b76dcb51f..bcaaeea43 160000
--- a/tests/tests_api
+++ b/tests/tests_api
@@ -1 +1 @@
-Subproject commit b76dcb51fe38d952078d44bfe811ddded9de642a
+Subproject commit bcaaeea430be8e4dc1ddd0b6a05375623ea14aa4
--
GitLab