From cea22736e8c45878f301ffd78c294014a4e4105a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nj=C3=A5l=20Ingers=C3=B8nn=20S=C3=B8rland?= <55444303+NjaalSoerland@users.noreply.github.com> Date: Sun, 2 Apr 2023 10:09:18 +0200 Subject: [PATCH 1/3] Update mailing lists --- apps/mailinglists/views.py | 78 +++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/apps/mailinglists/views.py b/apps/mailinglists/views.py index ca037c61b..ac6f67f94 100644 --- a/apps/mailinglists/views.py +++ b/apps/mailinglists/views.py @@ -56,10 +56,10 @@ def index(request): "members": [ {"name": "Akwaaba", "email": "akwaabapost.ntnu@gmail.com"}, {"name": "Apeiron", "email": "apeiron.ntnu@gmail.com"}, + {"name": "Babel", "email": "babel.linjeforening@gmail.com"}, {"name": "CAF", "email": "cafidrett@gmail.com"}, {"name": "Communitas", "email": "sosant.ntnu@gmail.com"}, {"name": "De Folkevalgte", "email": "defolkevalgte@gmail.com"}, - {"name": "De Passe Simple", "email": "depassesimple@gmail.com"}, {"name": "Dionysos", "email": "dionysoslinjeforening@gmail.com"}, {"name": "Det Gyldne Snitt", "email": "post.detgyldnesnitt@gmail.com"}, {"name": "Det Historiske Selskab", "email": "ntnu_dhs@hotmail.com"}, @@ -75,17 +75,19 @@ def index(request): {"name": "Leviathan", "email": "leviathan.ntnu@gmail.com"}, {"name": "LiMP", "email": "linjeforeningenlimp@gmail.com"}, {"name": "Lipton", "email": "liptonlinjeforening@gmail.com"}, - {"name": "Los Elegidos", "email": "loselegidoslinjeforening@gmail.com"}, + {"name": "Oda", "email": "oda.ntnu@gmail.com"}, + {"name": "Ordstyrer LF", "email": "ordstyrerhfsu@gmail.com"}, {"name": "Paideia", "email": "paideiantnu@gmail.com"}, - {"name": "Pareto", "email": "pareto.linjeforening@gmail.com"}, + {"name": "Panoptikon", "email": "offisielle.panoptikon@gmail.com"}, {"name": "Primetime", "email": "primetime.ntnu@gmail.com"}, {"name": "Psi", "email": "psi.linjeforening@gmail.com"}, {"name": "Psykolosjen", "email": "psykolosjen@gmail.com"}, + {"name": "Socialis", "email": "socialis.lf@gmail.com"}, {"name": "Socius Extremus", "email": "socius.extremus@hotmail.no"}, - {"name": "Sturm und Drang", "email": "sd.linjeforening@gmail.com"}, {"name": "SU Studentrådet", "email": "su@studentrad.no"}, {"name": "Teaterlosjen", "email": "hs@teaterlosjen.no"}, {"name": "Theodor", "email": "theodor.arkeologi@gmail.com"}, + {"name": "TKS", "email": "tks.ntnu@gmail.com"}, {"name": "YFF", "email": "yff.ntnu@hotmail.com"}, ], }, @@ -94,6 +96,7 @@ def index(request): "members": [ {"name": "Abakus", "email": "abakus@abakus.no"}, {"name": "A/F Smørekoppen", "email": "styret@smorekoppen.no"}, + {"name": "Antidot", "email": "antidot.ntnu@gmail.com"}, { "name": "Arkitektstudentenes Broderskab", "email": "kontakt@broderskabet.no", @@ -102,11 +105,14 @@ def index(request): {"name": "Delta", "email": "delta@delta.org.ntnu.no"}, {"name": "Elektra", "email": "leder@elektra.io"}, {"name": "Emil", "email": "styret@emilweb.no"}, + {"name": "Fraktur", "email": "fraktur.ntnu@gmail.com"}, + {"name": "FYSIO", "email": "trondheimfysio@gmail.com"}, {"name": "HC", "email": "styret@hc.ntnu.no"}, {"name": "H.M. Aarhønen", "email": "aarhonen-hs@list.stud.ntnu.no"}, {"name": "Hybrida", "email": "styret@hybrida.no"}, {"name": "Janus", "email": "janus@janus.org.ntnu.no"}, {"name": "Leonardo", "email": "ilpresidente.leonardo@gmail.com"}, + {"name": "Logitas", "email": "styret@logitas.no"}, {"name": "Mannhullet", "email": "styret@mannhullet.no"}, { "name": "MiT (ligger også på Kalvskinnet)", @@ -116,6 +122,7 @@ def index(request): {"name": "Nucleus", "email": "nucleuslinjeforening@gmail.com"}, {"name": "Omega", "email": "hs@omega.ntnu.no"}, {"name": "Online", "email": "online@online.ntnu.no"}, + {"name": "Pareto", "email": "pareto.linjeforening@gmail.com"}, {"name": "Placebo", "email": "placebo@list.stud.ntnu.no"}, {"name": "Signifikant", "email": "signifikant-styret@org.ntnu.no"}, {"name": "Solan", "email": "solan-leder@entreprenorskolen.no"}, @@ -129,19 +136,21 @@ def index(request): }, {"name": "Vivas", "email": "leder@vivas.teknikersamfunn.no"}, {"name": "Volvox & Alkymisten", "email": "styret@volvox.no"}, + {"name": "Ægir", "email": "styret@aegirntnu.no"}, ], }, { "name": "kalvskinnet", "members": [ + {"name": "Cibus", "email": "cibus.mattek@gmail.com"}, {"name": "KOM", "email": "kom.linjeforening@gmail.com"}, - {"name": "Logitas", "email": "styret@logitas.no"}, + { "name": "MiT (ligger også på Gløshaugen)", "email": "leder@maskining.no", }, {"name": "Nutrix", "email": "nutrixlinjeforening@gmail.com"}, - {"name": "SALT", "email": "postmottak@studentalt.no"}, + {"name": "SALT", "email": "post@saltntnu.no"}, { "name": "Tim & Shænko (ligger også på Gløshaugen)", "email": "styret@bygging.no", @@ -183,11 +192,17 @@ def index(request): "email": "masterforeninger@online.ntnu.no", }, {"name": "Badcom", "email": "badcom.mail@gmail.com"}, + {"name": "En Psykt Vanlig Uke", "email": "epvu.trondheim@gmail.com"}, + {"name": "Fadderutvalget", "email": "fadderutvalget@gmail.com"}, + {"name": "Høyre studentforening", "email": "hoyrestudenttrondheim@gmail.com"}, + {"name": "Taktlaus", "email": "styret@taktlaus.no"}, + {"name": "Mannskor", "email": "formann@mannskor.no"}, {"name": "NTNUI", "email": "hovedstyret@ntnui.no"}, {"name": "Radio Revolt", "email": "ntnu@radiorevolt.no"}, {"name": "Revolve NTNU", "email": "post@revolve.no"}, {"name": "Studenttinget", "email": "sti@studenttinget.no"}, {"name": "Samfundet", "email": "styret@samfundet.no"}, + {"name": "Studentkor", "email": "leder@studentkor.no"}, {"name": "Student-TV", "email": "styret@stv.no"}, {"name": "Sukkerhuset", "email": "styret@sukkerhuset.no"}, {"name": "Velferdstinget", "email": "vt@velferdstinget.no"}, @@ -197,7 +212,11 @@ def index(request): { "name": "masterforeninger", "members": [ + {"name": "Globus", "email": "globus.ntnu@gmail.com"}, {"name": "Hippodamus", "email": "post@hippodamus.no"}, + {"name": "Njord", "email": "leder.njord@gmail.com"}, + {"name": "Oda", "email": "oda.ntnu@gmail.com"}, + {"name": "Pokayoke", "email": "pokayoke.ntnu@gmail.com"}, {"name": "Projeksjon", "email": "kontakt@projeksjon.no"}, {"name": "ProMan", "email": "promanntnu@gmail.com"}, {"name": "Solan", "email": "solan-leder@entreprenorskolen.no"}, @@ -242,36 +261,49 @@ def index(request): { "name": "linjeledere", "members": [ - { - "name": "H.M. Aarhønen", - "email": "aarhonen-kanzler@list.stud.ntnu.no", - }, - {"name": "Timini", "email": "buckminister@timini.no"}, - {"name": "Delta", "email": "delta.leder@gmail.com"}, + {"name": "Abakus", "email": "leder@abakus.no"}, + {"name": "A/F Smørekoppen", "email": "phormand@smorekoppen.no"}, { "name": "Arkitektstudentenes Broderskab", "email": "dominus@broderskabet.no", }, - {"name": "Mannhullet", "email": "formann@mannhullet.no"}, - {"name": "Leonardo", "email": "ilpresidente.leonardo@gmail.com"}, - {"name": "Janus", "email": "janus-president@org.ntnu.no"}, - {"name": "Abakus", "email": "leder@abakus.no"}, + {"name": "Bakbenken", "email": "bakbenken@online.ntnu.no"}, {"name": "Bergstuderendes Forening", "email": "leder@bergstud.no"}, + {"name": "Delta", "email": "delta.leder@gmail.com"}, + {"name": "Elektra", "email": "leder@elektra.io"}, {"name": "Emil", "email": "leder@emilweb.no"}, + {"name": "FYSIO", "email": "trondheimfysio@gmail.com"}, + {"name": "Globus", "email": "president@globusntnu.no"}, + {"name": "HC", "email": "phormand@hc.ntnu.no"}, + {"name": "Helix", "email": "helix.leder@gmail.com"}, + { + "name": "H.M. Aarhønen", + "email": "aarhonen-kanzler@list.stud.ntnu.no", + }, {"name": "Hybrida", "email": "leder@hybrida.no"}, + {"name": "Janus", "email": "janus-president@org.ntnu.no"}, + {"name": "KOM", "email": "leder.kom.linjeforening@gmail.com"}, + {"name": "Leonardo", "email": "ilpresidente.leonardo@gmail.com"}, + {"name": "Mannhullet", "email": "formann@mannhullet.no"}, {"name": "Nabla", "email": "leder@nabla.ntnu.no"}, + {"name": "Nucleus", "email": "nucleus.leder@gmail.com"}, + {"name": "Nutix", "email": "leder@nutrix.no"}, + {"name": "Omega", "email": "stormeister@omega.ntnu.no"}, {"name": "Online", "email": "leder@online.ntnu.no"}, - {"name": "Volvox & Alkymisten", "email": "leder@volvox.no"}, - {"name": "HC", "email": "phormand@hc.ntnu.no"}, - {"name": "A/F Smørekoppen", "email": "phormand@smorekoppen.no"}, - {"name": "Placebo", "email": "placebo-leder@org.ntnu.no"}, + {"name": "Pareto", "email": "pareto.leder@gmail.com"}, + {"name": "Placebo", "email": "leder@mfplacebo.no"}, + {"name": "Salt", "email": "leder@saltntnu.no"}, + {"name": "Solan", "email": "leder@solanlinjeforening.no"}, {"name": "Spanskrøret", "email": "rektor@spanskroret.no"}, - {"name": "Solan", "email": "solan-leder@entreprenorskolen.no"}, {"name": "Studenttinget", "email": "sti@studenttinget.no"}, - {"name": "Omega", "email": "stormeister@omega.ntnu.no"}, {"name": "Studenttinget", "email": "styrerep@studenttinget.no"}, - {"name": "Bakbenken", "email": "bakbenken@online.ntnu.no"}, + {"name": "Støh", "email": "leder.stoh@gmail.com"}, + {"name": "Tihlde", "email": "president@tihlde.org"}, {"name": "Tim & Shænko", "email": "leder@bygging.no"}, + {"name": "Timini", "email": "buckminister@timini.no"}, + {"name": "Vivas", "email": "leder@vivasntnu.no"}, + {"name": "Volvox & Alkymisten", "email": "leder@volvox.no"}, + {"name": "Ægir", "email": "styreleder@aegirntnu.no"}, ], }, { From c2b6917c094a782701a02a0240ad0709dd392e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nj=C3=A5l=20S=C3=B8rland?= Date: Sun, 2 Apr 2023 10:22:23 +0200 Subject: [PATCH 2/3] Linter fix --- apps/mailinglists/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/mailinglists/views.py b/apps/mailinglists/views.py index ac6f67f94..425a54d1b 100644 --- a/apps/mailinglists/views.py +++ b/apps/mailinglists/views.py @@ -144,7 +144,6 @@ def index(request): "members": [ {"name": "Cibus", "email": "cibus.mattek@gmail.com"}, {"name": "KOM", "email": "kom.linjeforening@gmail.com"}, - { "name": "MiT (ligger også på Gløshaugen)", "email": "leder@maskining.no", @@ -194,7 +193,8 @@ def index(request): {"name": "Badcom", "email": "badcom.mail@gmail.com"}, {"name": "En Psykt Vanlig Uke", "email": "epvu.trondheim@gmail.com"}, {"name": "Fadderutvalget", "email": "fadderutvalget@gmail.com"}, - {"name": "Høyre studentforening", "email": "hoyrestudenttrondheim@gmail.com"}, + {"name": "Høyre studentforening", + "email": "hoyrestudenttrondheim@gmail.com"}, {"name": "Taktlaus", "email": "styret@taktlaus.no"}, {"name": "Mannskor", "email": "formann@mannskor.no"}, {"name": "NTNUI", "email": "hovedstyret@ntnui.no"}, From e393a8022ba9628fb6fd4283147774058e3b1260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nj=C3=A5l=20S=C3=B8rland?= Date: Sun, 2 Apr 2023 10:34:41 +0200 Subject: [PATCH 3/3] Linter fix --- apps/mailinglists/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/mailinglists/views.py b/apps/mailinglists/views.py index 425a54d1b..90ed73550 100644 --- a/apps/mailinglists/views.py +++ b/apps/mailinglists/views.py @@ -193,8 +193,10 @@ def index(request): {"name": "Badcom", "email": "badcom.mail@gmail.com"}, {"name": "En Psykt Vanlig Uke", "email": "epvu.trondheim@gmail.com"}, {"name": "Fadderutvalget", "email": "fadderutvalget@gmail.com"}, - {"name": "Høyre studentforening", - "email": "hoyrestudenttrondheim@gmail.com"}, + { + "name": "Høyre studentforening", + "email": "hoyrestudenttrondheim@gmail.com", + }, {"name": "Taktlaus", "email": "styret@taktlaus.no"}, {"name": "Mannskor", "email": "formann@mannskor.no"}, {"name": "NTNUI", "email": "hovedstyret@ntnui.no"},