Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DPLT-1132 Production release #165

Merged
merged 12 commits into from
Aug 3, 2023
Merged

DPLT-1132 Production release #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fa2c00a
S3 & Historical processing errors are bubbled up to single handler.
gabehamilton Jul 28, 2023
099234b
Merge pull request #156 from near/dplt-1012_error_handling_cleanup
gabehamilton Jul 31, 2023
03e1d9c
Handle new index file folder structure that is optimized for sub-acco…
gabehamilton Jul 31, 2023
53fb8a3
cargo fmt
gabehamilton Jul 31, 2023
d2f44e8
DPLT-1074 Queue real-time messages on Redis Streams (#157)
morgsmccauley Aug 1, 2023
18d0f9f
Revert "DPLT-1074 Queue real-time messages on Redis Streams" (#160)
morgsmccauley Aug 1, 2023
332b4a5
Revert "Revert "DPLT-1074 Queue real-time messages on Redis Streams""…
morgsmccauley Aug 2, 2023
cfc6271
Matches latest index files structure.
gabehamilton Aug 3, 2023
a829582
cargo fmt of format
gabehamilton Aug 3, 2023
5d9d1d4
Merge branch 'main' into dplt-1123_new_index_folder_structure
gabehamilton Aug 3, 2023
d35878c
Merge pull request #158 from near/dplt-1123_new_index_folder_structure
gabehamilton Aug 3, 2023
4f66ec3
DEC-1372 feat: add moderation list support for feed (#163)
roshaans Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Posts.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const GRAPHQL_ENDPOINT =
const sortOption = props.postsOrderOption || "blockHeight"; // following, blockHeight
const LIMIT = 25;
let accountsFollowing = props.accountsFollowing
const moderatorAccount = props?.moderatorAccount || "bosmod.near";

if (context.accountId && !accountsFollowing) {
const graph = Social.keys(`${context.accountId}/graph/follow/*`, "final");
Expand All @@ -12,6 +13,25 @@ if (context.accountId && !accountsFollowing) {
}
}

let filterUsersRaw = Social.get(
`${moderatorAccount}/moderate/users`,
"optimistic",
{
subscribe: true,
}
);

if (filterUsers === null) {
// haven't loaded filter list yet, return early
return "";
}

const filterUsers = filterUsersRaw ? JSON.parse(filterUsersRaw) : [];

const shouldFilter = (item) => {
return filterUsers.includes(item.accountId);
};

State.init({
selectedTab: Storage.privateGet("selectedTab") || "all",
posts: [],
Expand Down Expand Up @@ -297,7 +317,7 @@ return (
)}

<FeedWrapper>
<Widget src={`${APP_OWNER}/widget/QueryApi.Examples.Feed`} props={{ hasMore, loadMorePosts, posts: state.posts}} />
<Widget src={`${APP_OWNER}/widget/QueryApi.Examples.Feed`} props={{ hasMore, loadMorePosts, posts: state.posts.filter((i) => !shouldFilter(i))}} />
</FeedWrapper>
</Content>
</>
Expand Down
8 changes: 4 additions & 4 deletions indexer/indexer_rules_engine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ pub fn reduce_indexer_rule_matches_sync(
indexer_rule: &IndexerRule,
streamer_message: &StreamerMessage,
chain_id: ChainId,
) -> anyhow::Result<Vec<IndexerRuleMatch>> {
Ok(match &indexer_rule.matching_rule {
) -> Vec<IndexerRuleMatch> {
match &indexer_rule.matching_rule {
MatchingRule::ActionAny { .. }
| MatchingRule::ActionFunctionCall { .. }
| MatchingRule::Event { .. } => {
outcomes_reducer_sync::reduce_indexer_rule_matches_from_outcomes(
indexer_rule,
streamer_message,
chain_id,
)?
)
}
})
}
}
8 changes: 4 additions & 4 deletions indexer/indexer_rules_engine/src/outcomes_reducer_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub fn reduce_indexer_rule_matches_from_outcomes(
indexer_rule: &IndexerRule,
streamer_message: &StreamerMessage,
chain_id: ChainId,
) -> anyhow::Result<Vec<IndexerRuleMatch>> {
) -> Vec<IndexerRuleMatch> {
streamer_message
.shards
.iter()
Expand Down Expand Up @@ -41,8 +41,8 @@ fn build_indexer_rule_match(
block_header_hash: String,
block_height: u64,
chain_id: ChainId,
) -> anyhow::Result<IndexerRuleMatch> {
Ok(IndexerRuleMatch {
) -> IndexerRuleMatch {
IndexerRuleMatch {
chain_id: chain_id.clone(),
indexer_rule_id: indexer_rule.id,
indexer_rule_name: indexer_rule.name.clone(),
Expand All @@ -52,7 +52,7 @@ fn build_indexer_rule_match(
block_header_hash,
),
block_height,
})
}
}

fn build_indexer_rule_match_payload(
Expand Down
Loading
Loading