Skip to content
Snippets Groups Projects
Commit e710b92c authored by Martin Lees's avatar Martin Lees Committed by Howo
Browse files

Update SetRole/SetUserTitle so that you have to be subscribed to get it, also... 

Update SetRole/SetUserTitle so that you have to be subscribed to get it, also added a script to generate flow.txt and cleaned up communtiy_flow
parent d8ef9adc
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
hive/db/sql_scripts/community_helpers.sql 0 → 100644
+ 40
− 0
View file @ e710b92c
DROP FUNCTION IF EXISTS set_community_role_or_title;
CREATE OR REPLACE FUNCTION set_community_role_or_title(_community_id hive_posts.community_id%TYPE, _account_id hive_posts.author_id%TYPE, _role_id integer, _title varchar(140), _created_at timestamp)
RETURNS bool
LANGUAGE plpgsql
as
$$
declare
__subscription_id INTEGER;
__role_id SMALLINT;
BEGIN
SELECT id INTO __subscription_id FROM hive_subscriptions WHERE account_id = _account_id AND community_id = _community_id;
if _role_id IS NOT NULL THEN
SELECT role_id INTO __role_id FROM hive_roles WHERE account_id = _account_id AND community_id = _community_id;
--raise '%aa', __subscription_id;
-- We don't allow setting a higher role than the current one if you aren't subscribed
IF __subscription_id IS NULL AND ((__role_id IS NOT NULL AND __role_id < _role_id ) OR __role_id IS NULL) THEN
return false;
END IF;
ELSE
IF __subscription_id IS NULL THEN
return false;
END IF;
end if;
IF _role_id IS NOT NULL AND _title IS NULL THEN
INSERT INTO hive_roles(account_id, community_id, role_id, created_at)
VALUES (_account_id, _community_id, _role_id, _created_at)
ON CONFLICT (account_id, community_id)
DO UPDATE SET role_id = _role_id;
ELSIF _title IS NOT NULL AND _role_id IS NULL THEN
INSERT INTO hive_roles(account_id, community_id, title, created_at)
VALUES (_account_id, _community_id, _title, _created_at)
ON CONFLICT (account_id, community_id)
DO UPDATE SET title = _title;
END IF;
RETURN TRUE;
END;
$$;
\ No newline at end of file
hive/db/sql_scripts/db_upgrade.sh
+ 1
− 0
View file @ e710b92c
......@@ -75,6 +75,7 @@ for sql in upgrade/assert_public_schema.sql \
follows.sql \
is_superuser.sql \
update_hive_blocks_consistency_flag.sql \
community_helpers.sql \
update_table_statistics.sql # Must be last
do
......
hive/indexer/community.py
+ 16
− 18
View file @ e710b92c
......@@ -195,15 +195,15 @@ class Community:
"""Get user role within a specific community."""
return (
DB.query_one(
"""SELECT role_id FROM hive_roles
DB.query_one(
"""SELECT role_id FROM hive_roles
WHERE community_id = :community_id
AND account_id = :account_id
LIMIT 1""",
community_id=community_id,
account_id=account_id,
)
or Role.guest.value
community_id=community_id,
account_id=account_id,
)
or Role.guest.value
)
@classmethod
......@@ -369,24 +369,22 @@ class CommunityOp:
# Account-level actions
elif action == 'setRole':
DB.query(
"""INSERT INTO hive_roles
(account_id, community_id, role_id, created_at)
VALUES (:account_id, :community_id, :role_id, :date)
ON CONFLICT (account_id, community_id)
DO UPDATE SET role_id = :role_id """,
subscribed = DB.query_one(
"""SELECT * FROM set_community_role_or_title(:community_id, :account_id, :role_id, NULL::varchar, CAST(:date AS timestamp ))""",
**params,
)
if not subscribed:
log.info("set role failed account '%s' must be subscribed to the community", params['account'])
return
self._notify('set_role', payload=Role(self.role_id).name)
elif action == 'setUserTitle':
DB.query(
"""INSERT INTO hive_roles
(account_id, community_id, title, created_at)
VALUES (:account_id, :community_id, :title, :date)
ON CONFLICT (account_id, community_id)
DO UPDATE SET title = :title""",
subscribed = DB.query_one(
"""SELECT * FROM set_community_role_or_title(:community_id, :account_id, NULL::integer , :title, CAST(:date AS timestamp ))""",
**params,
)
if not subscribed:
log.info("set role failed account '%s' must be subscribed to the community", params['account'])
return
self._notify('set_label', payload=self.title)
# Post-level actions
......
mock_data/block_data/community_op/flow.txt
+ 337
− 288
View file @ e710b92c
This diff is collapsed.
mock_data/block_data/community_op/mock_block_data_community.json
+ 222
− 12
View file @ e710b92c
......@@ -647,6 +647,17 @@
"json_metadata": "{}"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"test-safari"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-135485\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -708,6 +719,17 @@
"json": "[\"updateProps\",{\"community\":\"hive-135485\",\"props\":{\"title\":\"World News\",\"about\":\"A place for major news from around the world.\",\"is_nsfw\":true,\"description\":\"\",\"flag_text\":\"\"}}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"blocktrades"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-135485\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -719,6 +741,17 @@
"json": "[\"setRole\",{\"community\":\"hive-135485\",\"account\":\"blocktrades\",\"role\":\"mod\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"test-safari"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-171487\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -730,6 +763,17 @@
"json": "[\"setRole\",{\"community\":\"hive-171487\",\"account\":\"test-safari\",\"role\":\"mod\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"test-safari"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-157439\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -741,6 +785,17 @@
"json": "[\"setRole\",{\"community\":\"hive-157439\",\"account\":\"test-safari\",\"role\":\"mod\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"test-safari"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-198723\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -760,7 +815,7 @@
"test-safari"
],
"id": "community",
"json": "[\"setUserTitle\",{\"community\":\"hive-135485\",\"account\":\"test-safari\",\"title\":\"Bill Gates\"}]"
"json": "[\"subscribe\",{\"community\":\"hive-135485\"}]"
}
},
{
......@@ -771,7 +826,7 @@
"test-safari"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-135485\"}]"
"json": "[\"setUserTitle\",{\"community\":\"hive-135485\",\"account\":\"test-safari\",\"title\":\"Bill Gates\"}]"
}
},
{
......@@ -893,6 +948,17 @@
"json": "[\"setRole\",{\"community\":\"hive-198723\",\"account\":\"test-safari\",\"role\":\"admin\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"test-safari"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-167892\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -909,10 +975,10 @@
"value": {
"required_auths": [],
"required_posting_auths": [
"hive-198723"
"alice"
],
"id": "community",
"json": "[\"setRole\",{\"community\":\"hive-198723\",\"account\":\"alice\",\"role\":\"member\"}]"
"json": "[\"subscribe\",{\"community\":\"hive-198723\"}]"
}
},
{
......@@ -920,10 +986,10 @@
"value": {
"required_auths": [],
"required_posting_auths": [
"hive-167892"
"hive-198723"
],
"id": "community",
"json": "[\"setRole\",{\"community\":\"hive-167892\",\"account\":\"alice\",\"role\":\"muted\"}]"
"json": "[\"setRole\",{\"community\":\"hive-198723\",\"account\":\"alice\",\"role\":\"member\"}]"
}
},
{
......@@ -931,10 +997,10 @@
"value": {
"required_auths": [],
"required_posting_auths": [
"hive-171487"
"hive-167892"
],
"id": "community",
"json": "[\"setRole\",{\"community\":\"hive-171487\",\"account\":\"alice\",\"role\":\"muted\"}]"
"json": "[\"setRole\",{\"community\":\"hive-167892\",\"account\":\"alice\",\"role\":\"muted\"}]"
}
},
{
......@@ -942,12 +1008,12 @@
"value": {
"required_auths": [],
"required_posting_auths": [
"alice"
"hive-171487"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-157439\"}]"
"json": "[\"setRole\",{\"community\":\"hive-171487\",\"account\":\"alice\",\"role\":\"muted\"}]"
}
},
},
{
"type": "custom_json_operation",
"value": {
......@@ -956,7 +1022,7 @@
"alice"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-198723\"}]"
"json": "[\"subscribe\",{\"community\":\"hive-157439\"}]"
}
},
{
......@@ -1149,6 +1215,17 @@
"json_metadata": "{}"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"alice"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-171488\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -1193,6 +1270,17 @@
"json": "[\"updateProps\",{\"community\":\"hive-171487\",\"props\":{\"title\":\"Banana\",\"about\":\"Banana-nothing.\",\"is_nsfw\":true,\"description\":\"Cherry\",\"flag_text\":\"Lemon\"}}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"test-safari"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-117600\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -1204,6 +1292,17 @@
"json": "[\"setRole\",{\"community\":\"hive-117600\",\"account\":\"test-safari\",\"role\":\"admin\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"roadscape"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-117600\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -1215,6 +1314,17 @@
"json": "[\"setRole\",{\"community\":\"hive-117600\",\"account\":\"roadscape\",\"role\":\"mod\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"gtg"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-117600\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -1465,6 +1575,7 @@
"json_metadata": "{}"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3117,6 +3228,17 @@
"json": "[\"mutePost\",{\"community\":\"hive-198723\",\"account\":\"alice\",\"permlink\":\"Second-after-muted-post-hive3\",\"notes\":\"I hate second posts too-hive3!\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"good-karma"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-117600\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3128,6 +3250,17 @@
"json": "[\"setRole\",{\"community\":\"hive-117600\",\"account\":\"good-karma\",\"role\":\"admin\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"abit"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-117600\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3196,6 +3329,17 @@
"ref_block_prefix": 1,
"expiration": "2020-03-23T12:17:00",
"operations": [
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"alice"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-188204\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3374,6 +3518,17 @@
"ref_block_prefix": 1,
"expiration": "2020-03-23T12:17:00",
"operations": [
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"agartha"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-188204\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3418,6 +3573,17 @@
"json": "[\"subscribe\",{\"community\":\"hive-165317\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"alice"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-171487\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3429,6 +3595,17 @@
"json": "[\"setRole\",{\"community\":\"hive-171487\",\"account\":\"alice\",\"role\":\"member\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"alice"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-157439\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3440,6 +3617,17 @@
"json": "[\"setRole\",{\"community\":\"hive-157439\",\"account\":\"alice\",\"role\":\"member\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"alice"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-198723\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3451,6 +3639,17 @@
"json": "[\"setRole\",{\"community\":\"hive-198723\",\"account\":\"alice\",\"role\":\"member\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"blocktrades"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-157439\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......@@ -3617,6 +3816,17 @@
"ref_block_prefix": 1,
"expiration": "2020-03-23T12:17:00",
"operations": [
{
"type": "custom_json_operation",
"value": {
"required_auths": [],
"required_posting_auths": [
"camilla"
],
"id": "community",
"json": "[\"subscribe\",{\"community\":\"hive-188204\"}]"
}
},
{
"type": "custom_json_operation",
"value": {
......
scripts/mocks_to_flow.py 0 → 100644
+ 54
− 0
View file @ e710b92c
# This script parses a json mock file and outputs a flow.txt file
import json
def parse_custom_json(op):
data = json.loads(op['json'].replace('\n', r'\n'))
if data[0] == 'subscribe' or data[0] == 'unsubscribe':
account = op['required_posting_auths'][0]
return r'custom_json_operation("%s" -> "%s")' % (account, json.dumps(data).replace('"', r'\"'))
elif data[0] == 'updateProps':
props = json.dumps(data[1]['props']).replace('"', r'\"')
return r'custom_json_operation("[\"updateProps\",{\"community\":\"%s\",\"props\":%s}]")' % (data[1]['community'], props)
else:
return 'custom_json_operation("%s")' % (json.dumps(data).replace('"', r'\"'))
def parse_op(op):
if op['type'] == 'account_create_operation':
return 'account_create_operation( `{}` )'.format(op['value']['new_account_name'])
elif op['type'] == 'comment_operation':
return 'comment_operation( `{}`, `{}`,`{}`)'.format(op['value']['parent_permlink'], op['value']['author'], op['value']['permlink'])
elif op['type'] == 'transfer_operation':
return 'transfer_operation( `{}`, `{}`, `{}`, `{}` )'.format(op['value']['from'], op['value']['to'], op['value']['amount'], op['value']['memo'])
elif op['type'] == 'custom_json_operation':
return parse_custom_json(op['value'])
elif op['type'] == 'custom_json_operation':
return parse_custom_json(op['value'])
elif op['type'] == 'account_update2_operation':
json_metadata = json.dumps(op['value']['json_metadata'].replace('\n', '\\n')).replace('"', '\"')
return 'transfer_operation( `{}`, `{}`, `{}`)'.format(op['value']['account'], json_metadata, op['value']['posting_json_metadata'])
elif op['type'] == 'delete_comment_operation':
return 'delete_comment_operation( `{}`, `{}`)'.format(op['value']['author'], op['value']['permlink'])
elif op['type'] == 'vote_operation':
return 'delete_comment_operation(`{}` -> `{}`, `{}`, `{}`)'.format(op['value']['voter'], op['value']['author'], op['value']['permlink'], op['value']['weight'])
else:
raise 'operation type not known'
if __name__ == "__main__":
import argparse
parser = argparse.ArgumentParser()
parser.add_argument("file", type=str, help="Path of the mock file")
args = parser.parse_args()
f = open(args.file)
data = json.load(f)
flow_str = ''
for block_id in data:
flow_str += '***block {}***\n'.format(block_id)
operations = data[block_id]['transactions'][0]['operations']
for op in operations:
flow_str += parse_op(op) + '\n'
print(flow_str)
\ No newline at end of file
  • Howo @howo

    mentioned in commit 26a4f1b0

     ·

    mentioned in commit 26a4f1b0

    Toggle commit list
  • Howo @howo

    mentioned in commit 44b1d438

     ·

    mentioned in commit 44b1d438

    Toggle commit list
  • Howo @howo

    mentioned in commit 049ae7fa

     ·

    mentioned in commit 049ae7fa

    Toggle commit list
  • Howo @howo

    mentioned in commit 95917a54

     ·

    mentioned in commit 95917a54

    Toggle commit list
  • Howo @howo

    mentioned in commit c4694d12

     ·

    mentioned in commit c4694d12

    Toggle commit list
  • Howo @howo

    mentioned in commit 2f5a5da5

     ·

    mentioned in commit 2f5a5da5

    Toggle commit list
  • Howo @howo

    mentioned in commit ced68c49

     ·

    mentioned in commit ced68c49

    Toggle commit list
  • Howo @howo

    mentioned in commit 1d715f18

     ·

    mentioned in commit 1d715f18

    Toggle commit list
  • Howo @howo

    mentioned in commit 13e985d4

     ·

    mentioned in commit 13e985d4

    Toggle commit list
  • Howo @howo

    mentioned in commit f9f460d7

     ·

    mentioned in commit f9f460d7

    Toggle commit list
  • Howo @howo

    mentioned in commit 3b1b621a

     ·

    mentioned in commit 3b1b621a

    Toggle commit list
  • Howo @howo

    mentioned in commit 80a3a3a1

     ·

    mentioned in commit 80a3a3a1

    Toggle commit list
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment