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.

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

Cleanup #1094

Merged
merged 31 commits into from
Jul 26, 2023
Merged

Cleanup #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3a2d182
Create gh-77a5-flag-of-chile.json
Aziz-JH Jul 26, 2023
4c6a039
Create gh-6146-canadian-pride-flag.json
Ategon Jul 26, 2023
cfa8e12
Create gh-304a-canadian-trans-flag.json
Ategon Jul 26, 2023
2fd6b9f
Create gh-6983-polandball.json
Aziz-JH Jul 26, 2023
d190ee2
Create gh-04e5-inunnguaq.json
Ategon Jul 26, 2023
48bb876
Create gh-5b6a-canadian-poppies.json
Ategon Jul 26, 2023
06923c2
Create gh-692f-german-boy-and-dutch-girl.json
Sheepolution Jul 26, 2023
3afcc75
Create gh-656a-tip-stevens-totems.json
Leidyviah Jul 26, 2023
a525e3c
Create gh-b074-estrangeiro.json
Aziz-JH Jul 26, 2023
f547846
Create gh-b1ae-tip-stevens-totems.json
Leidyviah Jul 26, 2023
b41c744
Create gh-fa91-nyan-cat-watching-a-sunflower.json
Aziz-JH Jul 26, 2023
0bfd0c7
Added warning for controversial entries
AnonymousRandomPerson Jul 26, 2023
985afdc
Merge pull request #1077 from Aziz-JH/patch-59
AnonymousRandomPerson Jul 26, 2023
8d90fc8
Merge pull request #1078 from Ategon/patch-14
AnonymousRandomPerson Jul 26, 2023
dfabd04
Create gh-ae46-the-mauritshuis.json
Sheepolution Jul 26, 2023
df8fd99
Merge pull request #1079 from Ategon/patch-15
AnonymousRandomPerson Jul 26, 2023
a1c5eb2
Merge pull request #1081 from Ategon/patch-16
AnonymousRandomPerson Jul 26, 2023
e518184
Merge pull request #1082 from Aziz-JH/patch-60
AnonymousRandomPerson Jul 26, 2023
48fdb0d
Merge pull request #1083 from Ategon/patch-17
AnonymousRandomPerson Jul 26, 2023
6183594
Merge pull request #1084 from Sheepolution/patch-3
AnonymousRandomPerson Jul 26, 2023
7f7a5c9
Create gh-706e-buurman-en-buurman.json
ThatzOkay Jul 26, 2023
0e99cac
Merge pull request #1085 from Leidyviah/patch-1
AnonymousRandomPerson Jul 26, 2023
2333b1f
Merge pull request #1086 from Aziz-JH/patch-61
AnonymousRandomPerson Jul 26, 2023
5dedeff
Merge pull request #1087 from Aziz-JH/patch-62
AnonymousRandomPerson Jul 26, 2023
c7c6d59
Create gh-f199-aspen-glass-bowl.json
Aziz-JH Jul 26, 2023
03ce996
Merge pull request #1088 from Leidyviah/patch-2
AnonymousRandomPerson Jul 26, 2023
8bccc13
Merge pull request #1089 from Sheepolution/patch-4
AnonymousRandomPerson Jul 26, 2023
e4f87ad
Merge pull request #1090 from ThatzOkay/patch-2
AnonymousRandomPerson Jul 26, 2023
3d624d8
Merge pull request #1091 from Aziz-JH/patch-63
AnonymousRandomPerson Jul 26, 2023
6afe749
Merge branch 'master' of https://github.com/placeAtlas/atlas-2023 int…
AnonymousRandomPerson Jul 26, 2023
0ba663a
Updated entries
AnonymousRandomPerson Jul 26, 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
42 changes: 42 additions & 0 deletions data/read-ids.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5040,3 +5040,45 @@
15ahuby
15aihkm
15ahxk3
15aiyim
15aj00j
15aitan
15aiuxh
15aine0
15air12
15aj75s
15ait6f
15aii5u
15aiiul
15aiwtz
15aiomp
15aj1u1
15aj7k3
15aizv9
15aj4sl
15aijv0
15aijju
15aj6tt
15aijw0
15aik60
15aiidv
15aj0n2
15airth
15ain34
15aj9oh
15ailpx
15aj17q
15aim87
15aiwai
15aj5kp
15aiwxr
15ainp2
15aj99q
15aipp5
15aitwc
15aj8cp
15aisez
15aiqfq
15aj3e4
15aindg
15aiiv3
15 changes: 14 additions & 1 deletion tools/merge_out.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@
filenames = os.listdir(patches_dir)
filenames.append(permanent_patch_file)

controversial_entries = set([
696, # lturepublic
1730, 2044, # Atatürk
2587, # Falklands War memorial
2955, # Lola
])
edited_controversial_entries = set()

for filename in filenames:
is_permanent_file = filename == permanent_patch_file
if is_permanent_file:
Expand Down Expand Up @@ -105,6 +113,8 @@
index = atlas_ids[entry['id']]
print(f"{filename}: Edited {atlas_data[index]['id']}.")
atlas_data[index] = entry
if entry['id'] in controversial_entries:
edited_controversial_entries.add(entry['id'])
else:
print(f"{filename}: Added {entry['id']}.")
atlas_data.append(entry)
Expand All @@ -126,4 +136,7 @@
with open('web/all-authors.txt', 'w', encoding='utf-8') as authors_file:
authors_file.write("\n".join(authors) + "\n")

print('All done.')
print('All done.')

if len(edited_controversial_entries) > 0:
print(f'Controversial entries edited: {edited_controversial_entries}. Inspect these manually for inappropriate content.')
12 changes: 12 additions & 0 deletions web/all-authors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2112,3 +2112,15 @@ DDGam3r
Kiruchi228
NyanFan95
Logical_Tradition_72
AlmostNL
elseven717
darkmoon82
KAWIS12
FilmGood5040
RioluGamer2911
D0oppa
Calm_Disk519
Ok_Thanks_5632
Twhite90100
ismichaelish
Bdgmr
Loading
Loading