nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-19 19:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'autofollow' setting

Browse Source
This commit is contained in:
Mike Dilger 2022-12-30 10:25:38 +13:00
parent 4969a7a08a
commit 409860ab29
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/person.rs
View File

@ -224,12 +224,8 @@ impl DbPerson {
Ok(()) Ok(())
} }
pub async fn populate_new_people(follow_everybody: bool) -> Result<(), Error> { pub async fn populate_new_people() -> Result<(), Error> {
let sql = if follow_everybody { let sql = "INSERT or IGNORE INTO person (pubkey) SELECT DISTINCT pubkey FROM EVENT";
"INSERT or IGNORE INTO person (pubkey, followed) SELECT DISTINCT pubkey, 1 FROM EVENT"
} else {
"INSERT or IGNORE INTO person (pubkey) SELECT DISTINCT pubkey FROM EVENT"
};
spawn_blocking(move || { spawn_blocking(move || {
let maybe_db = GLOBALS.db.blocking_lock(); let maybe_db = GLOBALS.db.blocking_lock();

5
src/overlord/mod.rs
View File

@ -96,10 +96,9 @@ impl Overlord {
// FIXME - if this needs doing, it should be done dynamically as // FIXME - if this needs doing, it should be done dynamically as
// new people are encountered, not batch-style on startup. // new people are encountered, not batch-style on startup.
// Create a person record for every person seen, possibly autofollow // Create a person record for every person seen
let autofollow = GLOBALS.settings.read().await.autofollow; DbPerson::populate_new_people().await?;
DbPerson::populate_new_people(autofollow).await?;
// FIXME - if this needs doing, it should be done dynamically as // FIXME - if this needs doing, it should be done dynamically as
// new people are encountered, not batch-style on startup. // new people are encountered, not batch-style on startup.

7
src/settings.rs
View File

@ -6,7 +6,6 @@ use tracing::error;
pub const DEFAULT_FEED_CHUNK: u64 = 43200; // 12 hours pub const DEFAULT_FEED_CHUNK: u64 = 43200; // 12 hours
pub const DEFAULT_OVERLAP: u64 = 600; // 10 minutes pub const DEFAULT_OVERLAP: u64 = 600; // 10 minutes
pub const DEFAULT_AUTOFOLLOW: bool = false;
pub const DEFAULT_VIEW_POSTS_REFERRED_TO: bool = true; pub const DEFAULT_VIEW_POSTS_REFERRED_TO: bool = true;
pub const DEFAULT_VIEW_POSTS_REFERRING_TO: bool = false; pub const DEFAULT_VIEW_POSTS_REFERRING_TO: bool = false;
pub const DEFAULT_VIEW_THREADED: bool = true; pub const DEFAULT_VIEW_THREADED: bool = true;
@ -20,7 +19,6 @@ pub const DEFAULT_POW: u8 = 0;
pub struct Settings { pub struct Settings {
pub feed_chunk: u64, pub feed_chunk: u64,
pub overlap: u64, pub overlap: u64,
pub autofollow: bool,
pub view_posts_referred_to: bool, pub view_posts_referred_to: bool,
pub view_posts_referring_to: bool, pub view_posts_referring_to: bool,
pub view_threaded: bool, pub view_threaded: bool,
@ -38,7 +36,6 @@ impl Default for Settings {
Settings { Settings {
feed_chunk: DEFAULT_FEED_CHUNK, feed_chunk: DEFAULT_FEED_CHUNK,
overlap: DEFAULT_OVERLAP, overlap: DEFAULT_OVERLAP,
autofollow: DEFAULT_AUTOFOLLOW,
view_posts_referred_to: DEFAULT_VIEW_POSTS_REFERRED_TO, view_posts_referred_to: DEFAULT_VIEW_POSTS_REFERRED_TO,
view_posts_referring_to: DEFAULT_VIEW_POSTS_REFERRING_TO, view_posts_referring_to: DEFAULT_VIEW_POSTS_REFERRING_TO,
view_threaded: DEFAULT_VIEW_THREADED, view_threaded: DEFAULT_VIEW_THREADED,
@ -73,7 +70,6 @@ impl Settings {
settings.feed_chunk = row.1.parse::<u64>().unwrap_or(DEFAULT_FEED_CHUNK) settings.feed_chunk = row.1.parse::<u64>().unwrap_or(DEFAULT_FEED_CHUNK)
} }
"overlap" => settings.overlap = row.1.parse::<u64>().unwrap_or(DEFAULT_OVERLAP), "overlap" => settings.overlap = row.1.parse::<u64>().unwrap_or(DEFAULT_OVERLAP),
"autofollow" => settings.autofollow = numstr_to_bool(row.1),
"view_posts_referred_to" => settings.view_posts_referred_to = numstr_to_bool(row.1), "view_posts_referred_to" => settings.view_posts_referred_to = numstr_to_bool(row.1),
"view_posts_referring_to" => { "view_posts_referring_to" => {
settings.view_posts_referring_to = numstr_to_bool(row.1) settings.view_posts_referring_to = numstr_to_bool(row.1)
@ -119,7 +115,7 @@ impl Settings {
let mut stmt = db.prepare( let mut stmt = db.prepare(
"REPLACE INTO settings (key, value) VALUES \ "REPLACE INTO settings (key, value) VALUES \
('feed_chunk', ?),('overlap', ?),('autofollow', ?),\ ('feed_chunk', ?),('overlap', ?),\
('view_posts_referred_to', ?),('view_posts_referring_to', ?),\ ('view_posts_referred_to', ?),('view_posts_referring_to', ?),\
('view_threaded', ?),('num_relays_per_person', ?),\ ('view_threaded', ?),('num_relays_per_person', ?),\
('max_relays', ?),('max_fps', ?),('feed_recompute_interval_ms', ?),\ ('max_relays', ?),('max_fps', ?),('feed_recompute_interval_ms', ?),\
@ -128,7 +124,6 @@ impl Settings {
stmt.execute(( stmt.execute((
self.feed_chunk, self.feed_chunk,
self.overlap, self.overlap,
if self.autofollow { "1" } else { "0" },
if self.view_posts_referred_to { if self.view_posts_referred_to {
"1" "1"
} else { } else {