From 252a4dc6976e0f719200a36a5cc8c7bdea9fee1a Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Thu, 10 Oct 2024 20:24:38 +0200 Subject: [PATCH 1/7] [mod] conf:example --- conf/example.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/example.json b/conf/example.json index 5afde0e..5821d0b 100644 --- a/conf/example.json +++ b/conf/example.json @@ -9,7 +9,8 @@ } ], "session_management": { - "in_memory": false + "in_memory": false, + "lifetime": 3600 }, "authentication": { "kind": "internal", From d3b61b620d39d077598043094ecae89db79cb31b Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Thu, 10 Oct 2024 23:00:29 +0200 Subject: [PATCH 2/7] [int] --- lib/plankton/plankton.d.ts | 52 +++++ lib/plankton/plankton.js | 192 ++++++++++++++++++ source/api/actions/calendar_add.ts | 2 + source/api/actions/calendar_change.ts | 2 + source/api/actions/calendar_get.ts | 1 + source/api/actions/calendar_list.ts | 14 +- source/api/actions/events.ts | 14 +- source/database.ts | 2 +- source/main.ts | 2 + source/repositories/calendar.ts | 73 +++++-- source/repositories/sql/calendar_overview.sql | 14 +- source/services/calendar.ts | 48 +++-- source/types.ts | 1 + tools/update-plankton | 2 + 14 files changed, 376 insertions(+), 43 deletions(-) diff --git a/lib/plankton/plankton.d.ts b/lib/plankton/plankton.d.ts index 2d664db..a48e5eb 100644 --- a/lib/plankton/plankton.d.ts +++ b/lib/plankton/plankton.d.ts @@ -2919,6 +2919,58 @@ declare namespace lib_plankton.session { clear?: boolean; }): Promise; } +declare namespace lib_plankton { + namespace order { + /** + */ + type type_order = ((x: type_value, y: type_value) => boolean); + /** + */ + type type_comparator = ((x: type_value, y: type_value) => int); + /** + */ + type type_sorter = ((list: Array) => Array); + /** + */ + function from_comparator(comparator: type_comparator): type_order; + /** + */ + function to_comparator(order: type_order): type_comparator; + /** + */ + function order_default(): type_order; + /** + * @desc provide a total order given by a list + */ + function order_total(list: Array, options?: { + collation?: ((x: type_value, y: type_value) => boolean); + }): type_order; + /** + * @desc lexicographic order + */ + function order_lexicographic_pair(options?: { + order_first?: type_order; + order_second?: type_order; + }): type_order>; + /** + */ + function order_lexicographic_pair_wrapped(extract_first: ((container: type_container) => type_value_first), extract_second: ((container: type_container) => type_value_second), options?: { + order_first?: type_order; + order_second?: type_order; + }): type_order; + /** + * @desc lexicographic order + */ + function order_lexicographic_list(options?: { + order?: type_order; + }): type_order>; + /** + */ + function sorter_merge(options?: { + order?: type_order; + }): type_sorter; + } +} declare namespace lib_plankton.pit { /** */ diff --git a/lib/plankton/plankton.js b/lib/plankton/plankton.js index bd4afd2..ba20662 100644 --- a/lib/plankton/plankton.js +++ b/lib/plankton/plankton.js @@ -10098,6 +10098,198 @@ var lib_plankton; })(session = lib_plankton.session || (lib_plankton.session = {})); })(lib_plankton || (lib_plankton = {})); /* +This file is part of »bacterio-plankton:order«. + +Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' + + +»bacterio-plankton:order« is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +»bacterio-plankton:order« is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with »bacterio-plankton:order«. If not, see . + */ +var lib_plankton; +(function (lib_plankton) { + var order; + (function (order_1) { + /** + */ + function from_comparator(comparator) { + return (function (x, y) { return (comparator(x, y) <= 0); }); + } + order_1.from_comparator = from_comparator; + /** + */ + function to_comparator(order) { + return (function (x, y) { return (order(x, y) ? (order(y, x) ? 0 : -1) : 1); }); + } + order_1.to_comparator = to_comparator; + /** + */ + function order_default() { + return (function (value1, value2) { return (value1 <= value2); }); + } + order_1.order_default = order_default; + /** + * @desc provide a total order given by a list + */ + function order_total(list, options) { + if (options === void 0) { options = {}; } + options = Object.assign({ + "collation": (function (x, y) { return (x === y); }) + }, options); + return (function (value1, value2) { + var index1 = list.findIndex(function (value) { return options.collation(value, value1); }); + var index2 = list.findIndex(function (value) { return options.collation(value, value2); }); + return (index1 <= index2); + }); + } + order_1.order_total = order_total; + /** + * @desc lexicographic order + */ + function order_lexicographic_pair(options) { + if (options === void 0) { options = {}; } + options = Object.assign({ + "order_first": order_default(), + "order_second": order_default() + }, options); + return (function (pair1, pair2) { + var le_first = options.order_first(pair1.first, pair2.first); + var ge_first = options.order_first(pair2.first, pair1.first); + if (le_first && !ge_first) { + return true; + } + else if (!le_first && ge_first) { + return false; + } + else { + var le_second = options.order_second(pair1.second, pair2.second); + var ge_second = options.order_second(pair2.second, pair1.second); + if (le_second && !ge_second) { + return true; + } + else if (!le_second && ge_second) { + return false; + } + else { + return true; + } + } + }); + } + order_1.order_lexicographic_pair = order_lexicographic_pair; + /** + */ + function order_lexicographic_pair_wrapped(extract_first, extract_second, options) { + if (options === void 0) { options = {}; } + return (function (container1, container2) { return order_lexicographic_pair({ + "order_first": options.order_first, + "order_second": options.order_second + })({ + "first": extract_first(container1), + "second": extract_second(container1) + }, { + "first": extract_first(container2), + "second": extract_second(container2) + }); }); + } + order_1.order_lexicographic_pair_wrapped = order_lexicographic_pair_wrapped; + /** + * @desc lexicographic order + */ + function order_lexicographic_list(options) { + if (options === void 0) { options = {}; } + options = Object.assign({ + "order": order_default() + }, options); + return (function (list1, list2) { + if (list1.length <= 0) { + if (list2.length <= 0) { + return true; + } + else { + return false; + } + } + else { + if (list2.length <= 0) { + return false; + } + else { + var element1 = list1[0]; + var element2 = list2[0]; + var le = options.order(element1, element2); + var ge = options.order(element2, element1); + if (le && !ge) { + return true; + } + else if (!le && ge) { + return false; + } + else { + return order_lexicographic_list({ "order": options.order })(list1.slice(1), list2.slice(1)); + } + } + } + }); + } + order_1.order_lexicographic_list = order_lexicographic_list; + /** + */ + function merger(options) { + if (options === void 0) { options = {}; } + options = Object.assign({ + "order": order_default() + }, options); + return (function (list1, list2) { + if (list1.length <= 0) { + return list2; + } + else if (list2.length <= 0) { + return list1; + } + else { + var element1 = list1[0]; + var element2 = list2[0]; + return (options.order(element1, element2) + ? ([element1].concat(merger({ "order": options.order })(list1.slice(1), list2))) + : ([element2].concat(merger({ "order": options.order })(list1, list2.slice(1))))); + } + }); + } + /** + */ + function sorter_merge(options) { + if (options === void 0) { options = {}; } + options = Object.assign({ + "order": order_default() + }, options); + return (function (list) { + if (list.length <= 0) { + return []; + } + else if (list.length === 1) { + return [list[0]]; + } + else { + var n = ((list.length + 1) >> 1); + return merger({ "order": options.order })(sorter_merge({ "order": options.order })(list.slice(0, n)), sorter_merge({ "order": options.order })(list.slice(n))); + } + }); + } + order_1.sorter_merge = sorter_merge; + })(order = lib_plankton.order || (lib_plankton.order = {})); +})(lib_plankton || (lib_plankton = {})); +/* This file is part of »bacterio-plankton:pit«. Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' diff --git a/source/api/actions/calendar_add.ts b/source/api/actions/calendar_add.ts index 4d49ab3..949cbdc 100644 --- a/source/api/actions/calendar_add.ts +++ b/source/api/actions/calendar_add.ts @@ -12,6 +12,7 @@ namespace _zeitbild.api { name : string; access : { + public : boolean; default_level : string; attributed : Array< { @@ -89,6 +90,7 @@ namespace _zeitbild.api const calendar_object : _zeitbild.type_calendar_object = { "name": stuff.input.name, "access": { + "public": stuff.input.access.public, "default_level": _zeitbild.value_object.access_level.from_string(stuff.input.access.default_level), "attributed": lib_plankton.map.hashmap.implementation_map( lib_plankton.map.hashmap.make( diff --git a/source/api/actions/calendar_change.ts b/source/api/actions/calendar_change.ts index 4e2bc19..07a32d8 100644 --- a/source/api/actions/calendar_change.ts +++ b/source/api/actions/calendar_change.ts @@ -12,6 +12,7 @@ namespace _zeitbild.api { name : string; access : { + public : boolean; default_level : ("none" | "view" | "edit" | "admin"); attributed : Array< { @@ -54,6 +55,7 @@ namespace _zeitbild.api const calendar_object_new : _zeitbild.type_calendar_object = { "name": stuff.input.name, "access": { + "public": stuff.input.access.public, "default_level": _zeitbild.value_object.access_level.from_string(stuff.input.access.default_level), "attributed": lib_plankton.map.hashmap.implementation_map( lib_plankton.map.hashmap.make( diff --git a/source/api/actions/calendar_get.ts b/source/api/actions/calendar_get.ts index 2c26105..cdb4b0d 100644 --- a/source/api/actions/calendar_get.ts +++ b/source/api/actions/calendar_get.ts @@ -45,6 +45,7 @@ namespace _zeitbild.api const result = { "name": calendar_object.name, "access": { + "public": calendar_object.access.public, "default_level": _zeitbild.api.access_level_encode(calendar_object.access.default_level), "attributed": lib_plankton.call.convey( calendar_object.access.attributed, diff --git a/source/api/actions/calendar_list.ts b/source/api/actions/calendar_list.ts index b3c9608..5c345dd 100644 --- a/source/api/actions/calendar_list.ts +++ b/source/api/actions/calendar_list.ts @@ -54,10 +54,18 @@ namespace _zeitbild.api ], } }), - "restriction": restriction_logged_in, + "restriction": restriction_none, "execution": async (stuff) => { - const session : {key : string; value : lib_plankton.session.type_session;} = await session_from_stuff(stuff); - const user_id : _zeitbild.type_user_id = await _zeitbild.service.user.identify(session.value.name); + const user_id : (null | _zeitbild.type_user_id) = await ( + session_from_stuff(stuff) + .then( + (session : {key : string; value : lib_plankton.session.type_session;}) => ( + _zeitbild.service.user.identify(session.value.name) + .catch(x => Promise.resolve(null)) + ) + ) + .catch(x => Promise.resolve(null)) + ); return ( _zeitbild.service.calendar.overview(user_id) diff --git a/source/api/actions/events.ts b/source/api/actions/events.ts index 2623dbe..5e9ec64 100644 --- a/source/api/actions/events.ts +++ b/source/api/actions/events.ts @@ -123,10 +123,18 @@ namespace _zeitbild.api ], } }), - "restriction": restriction_logged_in, + "restriction": restriction_none, "execution": async (stuff) => { - const session : {key : string; value : lib_plankton.session.type_session;} = await session_from_stuff(stuff); - const user_id : _zeitbild.type_user_id = await _zeitbild.service.user.identify(session.value.name); + const user_id : (null | _zeitbild.type_user_id) = await ( + session_from_stuff(stuff) + .then( + (session : {key : string; value : lib_plankton.session.type_session;}) => ( + _zeitbild.service.user.identify(session.value.name) + .catch(x => Promise.resolve(null)) + ) + ) + .catch(x => Promise.resolve(null)) + ); const from : lib_plankton.pit.type_pit = parseInt(stuff.query_parameters["from"]); const to : lib_plankton.pit.type_pit = parseInt(stuff.query_parameters["to"]); diff --git a/source/database.ts b/source/database.ts index c88a3ab..020d70d 100644 --- a/source/database.ts +++ b/source/database.ts @@ -5,7 +5,7 @@ namespace _zeitbild.database /** */ const _compatible_revisions : Array = [ - "r1", + "r2", ]; diff --git a/source/main.ts b/source/main.ts index 83ffc25..d20dcc9 100644 --- a/source/main.ts +++ b/source/main.ts @@ -16,6 +16,7 @@ type type_data = { id : int; name : string; access : { + public ?: boolean; default_level : ("none" | "view" | "edit" | "admin"); attributed : Array< { @@ -119,6 +120,7 @@ async function data_init( const calendar_object : _zeitbild.type_calendar_object = { "name": calendar_raw.name, "access": { + "public": (calendar_raw.access.public ?? false), "default_level": _zeitbild.value_object.access_level.from_string(calendar_raw.access.default_level), "attributed": lib_plankton.map.hashmap.implementation_map( lib_plankton.map.hashmap.make( diff --git a/source/repositories/calendar.ts b/source/repositories/calendar.ts index 0583c67..30c5beb 100644 --- a/source/repositories/calendar.ts +++ b/source/repositories/calendar.ts @@ -145,6 +145,7 @@ namespace _zeitbild.repository.calendar return { "core_row": { "name": object.name, + "access_public": object.access.public, "access_level_default": encode_access_level(object.access.default_level), "resource_id": object.resource_id, }, @@ -171,6 +172,7 @@ namespace _zeitbild.repository.calendar return { "name": dispersal.core_row["name"], "access": { + "public": dispersal.core_row["access_public"], "default_level": decode_access_level(dispersal.core_row["access_level_default"]), "attributed": lib_plankton.map.hashmap.implementation_map( lib_plankton.map.hashmap.make<_zeitbild.type_user_id, _zeitbild.enum_access_level>( @@ -351,15 +353,21 @@ namespace _zeitbild.repository.calendar /** */ + type type_overview_entry = { + id : _zeitbild.type_calendar_id; + name : string; + access_level : _zeitbild.enum_access_level; + } + + + /** + * @todo caching + */ export async function overview( - user_id : _zeitbild.type_user_id + user_id : (null | _zeitbild.type_user_id) ) : Promise< Array< - { - id : _zeitbild.type_calendar_id; - name : string; - access_level : _zeitbild.enum_access_level; - } + type_overview_entry > > { @@ -377,13 +385,52 @@ namespace _zeitbild.repository.calendar ) .then( (rows) => Promise.resolve( - rows - .map( - (row) => ({ - "id": row["id"], - "name": row["name"], - "access_level": decode_access_level(row["access_level"]), - }) + lib_plankton.call.convey( + rows, + [ + (x : Array>) => x.map( + (row : Record) => ({ + "id": row["id"], + "name": row["name"], + /** + * @todo unite with _zeitbild.service.calendar.get_access_level + */ + "access_level": decode_access_level( + Math.max( + (row["access_public"] ? 1 : 0), + ( + (user_id === null) + ? + 0 + : + (row["access_level_attributed"] ?? row["access_level_default"]) + ) + ) + ), + }) + ), + (x : Array) => x.filter( + (row) => ( + ! _zeitbild.value_object.access_level.order( + row.access_level, + _zeitbild.enum_access_level.none + ) + ) + ), + (x : Array) => lib_plankton.list.sorted( + x, + { + "compare_element": lib_plankton.order.order_lexicographic_pair_wrapped( + row => row.access_level, + row => row.id, + { + "order_first": _zeitbild.value_object.access_level.order, + "order_second": (a, b) => (a <= b) + } + ), + } + ), + ] ) ) ) diff --git a/source/repositories/sql/calendar_overview.sql b/source/repositories/sql/calendar_overview.sql index 4d0f562..2c67e4e 100644 --- a/source/repositories/sql/calendar_overview.sql +++ b/source/repositories/sql/calendar_overview.sql @@ -1,20 +1,12 @@ SELECT x.id AS id, x.name AS name, - ( - CASE - WHEN MAX(y.level) IS NULL THEN x.access_level_default - ELSE MAX(y.level) - END - ) AS access_level + x.access_public AS access_public, + x.access_level_default AS access_level_default, + y.level AS access_level_attributed FROM calendars AS x LEFT OUTER JOIN calendar_access_attributed AS y ON ((x.id = y.calendar_id) AND (y.user_id = $user_id)) GROUP BY x.id -HAVING - (access_level > 0) -ORDER BY - access_level DESC, - id ; diff --git a/source/services/calendar.ts b/source/services/calendar.ts index 3c6c63b..377c3a8 100644 --- a/source/services/calendar.ts +++ b/source/services/calendar.ts @@ -3,18 +3,42 @@ namespace _zeitbild.service.calendar { /** - * checks if a user has a sufficient access level */ function get_access_level( calendar_object : _zeitbild.type_calendar_object, - user_id : _zeitbild.type_user_id + user_id : (null | _zeitbild.type_user_id) ) : _zeitbild.enum_access_level { - return calendar_object.access.attributed.get( - user_id, - lib_plankton.pod.make_filled<_zeitbild.enum_access_level>( - calendar_object.access.default_level - ) + return ( + lib_plankton.list.max<_zeitbild.enum_access_level, _zeitbild.enum_access_level>( + [ + ( + calendar_object.access.public + ? + _zeitbild.enum_access_level.view + : + _zeitbild.enum_access_level.none + ), + ( + (user_id === null) + ? + _zeitbild.enum_access_level.none + : + calendar_object.access.attributed.get( + user_id, + lib_plankton.pod.make_filled<_zeitbild.enum_access_level>( + calendar_object.access.default_level + ) + ) + ), + ], + x => x, + { + "compare_value": _zeitbild.value_object.access_level.order, + } + )?.value + ?? + _zeitbild.enum_access_level.none ); } @@ -24,7 +48,7 @@ namespace _zeitbild.service.calendar */ function wrap_check_access_level( calendar_object : _zeitbild.type_calendar_object, - user_id : _zeitbild.type_user_id, + user_id : (null | _zeitbild.type_user_id), threshold : _zeitbild.enum_access_level, success_handler : ( (access_level : _zeitbild.enum_access_level) @@ -59,7 +83,7 @@ namespace _zeitbild.service.calendar /** */ export function overview( - user_id : _zeitbild.type_user_id + user_id : (null | _zeitbild.type_user_id) ) : Promise< Array< { @@ -243,12 +267,13 @@ namespace _zeitbild.service.calendar /** + * @todo optimize by reducing the number of database queries */ async function get_events( calendar_id : _zeitbild.type_calendar_id, from_pit : lib_plankton.pit.type_pit, to_pit : lib_plankton.pit.type_pit, - user_id : _zeitbild.type_user_id + user_id : (null | _zeitbild.type_user_id) ) : Promise< Array< { @@ -401,13 +426,12 @@ namespace _zeitbild.service.calendar /** - * @todo check access level */ export async function gather_events( calendar_ids_wanted : (null | Array<_zeitbild.type_calendar_id>), from_pit : lib_plankton.pit.type_pit, to_pit : lib_plankton.pit.type_pit, - user_id : _zeitbild.type_user_id + user_id : (null | _zeitbild.type_user_id) ) : Promise< Array< { diff --git a/source/types.ts b/source/types.ts index 920de23..91baee5 100644 --- a/source/types.ts +++ b/source/types.ts @@ -96,6 +96,7 @@ namespace _zeitbild export type type_calendar_object = { name : string; access : { + public : boolean; default_level : enum_access_level; attributed : lib_plankton.map.type_map< type_user_id, diff --git a/tools/update-plankton b/tools/update-plankton index 0ba6a65..5f646fd 100755 --- a/tools/update-plankton +++ b/tools/update-plankton @@ -15,6 +15,8 @@ modules="${modules} session" modules="${modules} file" modules="${modules} string" modules="${modules} json" +modules="${modules} list" +modules="${modules} order" modules="${modules} ical" modules="${modules} url" modules="${modules} http" From ed822041f3758fd215dae5c525a1b7be7a0b42dd Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Thu, 10 Oct 2024 23:51:58 +0200 Subject: [PATCH 3/7] [mod] add caching --- lib/plankton/plankton.d.ts | 93 +++++++++++ lib/plankton/plankton.js | 283 ++++++++++++++++++++++++++++++++ source/base.ts | 8 + source/main.ts | 8 + source/repositories/calendar.ts | 122 +++++++------- source/repositories/resource.ts | 12 +- source/services/calendar.ts | 117 +++++++------ tools/makefile | 1 + tools/update-plankton | 1 + 9 files changed, 535 insertions(+), 110 deletions(-) create mode 100644 source/base.ts diff --git a/lib/plankton/plankton.d.ts b/lib/plankton/plankton.d.ts index a48e5eb..6e5adc3 100644 --- a/lib/plankton/plankton.d.ts +++ b/lib/plankton/plankton.d.ts @@ -2381,6 +2381,99 @@ declare namespace lib_plankton.storage.sql_table_common { }[]>; } } +declare namespace lib_plankton.cache { + /** + */ + type type_cache = { + init: (() => Promise); + clear: (() => Promise); + query: ((key: string, retrieve: (() => Promise)) => Promise<{ + retrieved: boolean; + value: type_value; + }>); + }; +} +declare namespace lib_plankton.cache { + /** + */ + function get(cache: type_cache, key: string, retrieve: (() => Promise)): Promise; + /** + */ + function get_complex(cache: type_cache, group: string, input: type_input, retrieve: ((input: type_input) => Promise), options?: { + encode_input?: ((input: type_input) => string); + }): Promise; +} +declare namespace lib_plankton.cache.never { + /** + * @author fenris + */ + type type_subject = {}; + /** + * @author fenris + */ + function make(): type_subject; + /** + */ + function implementation(subject: type_subject): type_cache; +} +declare namespace lib_plankton.cache.always { + /** + * @author fenris + */ + type type_subject = { + value: lib_plankton.pod.type_pod; + }; + /** + * @author fenris + */ + function make(value: lib_plankton.pod.type_pod): type_subject; + /** + * @author fenris + */ + function clear(subject: type_subject): Promise; + /** + * @author fenris + */ + function query(subject: type_subject, key: string, retrieve: (() => Promise)): Promise<{ + retrieved: boolean; + value: type_value; + }>; + /** + */ + function implementation(subject: type_subject): type_cache; +} +declare namespace lib_plankton.cache.chest { + /** + * @author fenris + */ + type type_subject = { + chest: lib_plankton.storage.type_chest; + }; + /** + * @author fenris + */ + function make(options?: { + chest?: lib_plankton.storage.type_chest; + }): type_subject; + /** + * @author fenris + */ + function init(subject: type_subject): Promise; + /** + * @author fenris + */ + function clear(subject: type_subject): Promise; + /** + * @author fenris + */ + function query(subject: type_subject, key: string, retrieve: (() => Promise)): Promise<{ + retrieved: boolean; + value: type_value; + }>; + /** + */ + function implementation(subject: type_subject): type_cache; +} declare namespace lib_plankton.shape { /** * @todo diff --git a/lib/plankton/plankton.js b/lib/plankton/plankton.js index ba20662..bbc1b13 100644 --- a/lib/plankton/plankton.js +++ b/lib/plankton/plankton.js @@ -7423,6 +7423,289 @@ var lib_plankton; })(storage = lib_plankton.storage || (lib_plankton.storage = {})); })(lib_plankton || (lib_plankton = {})); /* +This file is part of »bacterio-plankton:cache«. + +Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' + + +»bacterio-plankton:cache« is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +»bacterio-plankton:cache« is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with »bacterio-plankton:cache«. If not, see . + */ +/* +This file is part of »bacterio-plankton:cache«. + +Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' + + +»bacterio-plankton:cache« is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +»bacterio-plankton:cache« is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with »bacterio-plankton:cache«. If not, see . + */ +var lib_plankton; +(function (lib_plankton) { + var cache; + (function (cache_1) { + /** + */ + function get(cache, key, retrieve) { + return cache.query(key, retrieve).then(result => result.value); + } + cache_1.get = get; + /** + */ + function get_complex(cache, group, input, retrieve, options = {}) { + options = Object.assign({ + "encode_input": input => JSON.stringify(input), + }, options); + return get(cache, (group + "." + options.encode_input(input)), () => retrieve(input)); + } + cache_1.get_complex = get_complex; + })(cache = lib_plankton.cache || (lib_plankton.cache = {})); +})(lib_plankton || (lib_plankton = {})); +/* +This file is part of »bacterio-plankton:cache«. + +Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' + + +»bacterio-plankton:cache« is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +»bacterio-plankton:cache« is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with »bacterio-plankton:cache«. If not, see . + */ +var lib_plankton; +(function (lib_plankton) { + var cache; + (function (cache) { + var never; + (function (never) { + /** + * @author fenris + */ + function make() { + return {}; + } + never.make = make; + /** + * @author fenris + */ + function clear(subject) { + return Promise.resolve(undefined); + } + /** + * @author fenris + */ + async function query(subject, key, retrieve) { + return { + "retrieved": true, + "value": (await retrieve()), + }; + } + /** + */ + function implementation(subject) { + return { + "init": () => Promise.resolve(undefined), + "clear": () => clear(subject), + "query": (key, retrieve) => query(subject, key, retrieve), + }; + } + never.implementation = implementation; + })(never = cache.never || (cache.never = {})); + })(cache = lib_plankton.cache || (lib_plankton.cache = {})); +})(lib_plankton || (lib_plankton = {})); +/* +This file is part of »bacterio-plankton:cache«. + +Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' + + +»bacterio-plankton:cache« is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +»bacterio-plankton:cache« is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with »bacterio-plankton:cache«. If not, see . + */ +var lib_plankton; +(function (lib_plankton) { + var cache; + (function (cache) { + var always; + (function (always) { + /** + * @author fenris + */ + function make(value) { + return { + "value": value, + }; + } + always.make = make; + /** + * @author fenris + */ + function clear(subject) { + return Promise.resolve(undefined); + } + always.clear = clear; + /** + * @author fenris + */ + function query(subject, key, retrieve) { + if (lib_plankton.pod.is_filled(subject.value)) { + return Promise.resolve({ + "retrieved": false, + "value": lib_plankton.pod.cull(subject.value), + }); + } + else { + return Promise.reject(); + } + } + always.query = query; + /** + */ + function implementation(subject) { + return { + "init": () => Promise.resolve(undefined), + "clear": () => clear(subject), + "query": (key, retrieve) => query(subject, key, retrieve), + }; + } + always.implementation = implementation; + })(always = cache.always || (cache.always = {})); + })(cache = lib_plankton.cache || (lib_plankton.cache = {})); +})(lib_plankton || (lib_plankton = {})); +/* +This file is part of »bacterio-plankton:cache«. + +Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' + + +»bacterio-plankton:cache« is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +»bacterio-plankton:cache« is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with »bacterio-plankton:cache«. If not, see . + */ +var lib_plankton; +(function (lib_plankton) { + var cache; + (function (cache) { + var chest; + (function (chest) { + /** + * @author fenris + */ + function make(options = {}) { + options = Object.assign({ + "chest": lib_plankton.storage.memory.implementation_chest({}), + }, options); + return { + "chest": options.chest, + }; + } + chest.make = make; + /** + * @author fenris + */ + function init(subject) { + return subject.chest.setup(undefined); + } + chest.init = init; + /** + * @author fenris + */ + function clear(subject) { + return subject.chest.clear(); + } + chest.clear = clear; + /** + * @author fenris + */ + function query(subject, key, retrieve) { + return (subject.chest.read(key) + .then(value => (lib_plankton.log.info("cache.chest_hashed.known", { + "key": key, + }) + , + Promise.resolve({ + "retrieved": false, + "value": value, + }))) + .catch(() => (lib_plankton.log.info("cache.chest_hashed.unknown", { + "key": key, + }) + , + (retrieve() + .then((value) => (subject.chest.write(key, value) + .then(() => Promise.resolve({ + "retrieved": true, + "value": value, + })))) + /* + .catch( + (reason) => Promise.reject<{retrieved : boolean; value : type_value}>(reason) + ) + */ + )))); + } + chest.query = query; + /** + */ + function implementation(subject) { + return { + "init": () => init(subject), + "clear": () => clear(subject), + "query": (key, retrieve) => query(subject, key, retrieve), + }; + } + chest.implementation = implementation; + })(chest = cache.chest || (cache.chest = {})); + })(cache = lib_plankton.cache || (lib_plankton.cache = {})); +})(lib_plankton || (lib_plankton = {})); +/* This file is part of »bacterio-plankton:shape«. Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' diff --git a/source/base.ts b/source/base.ts new file mode 100644 index 0000000..4aa10be --- /dev/null +++ b/source/base.ts @@ -0,0 +1,8 @@ +namespace _zeitbild +{ + + /** + */ + export var cache : lib_plankton.cache.type_cache; + +} diff --git a/source/main.ts b/source/main.ts index d20dcc9..326b563 100644 --- a/source/main.ts +++ b/source/main.ts @@ -260,6 +260,14 @@ async function main( ) ) ); + _zeitbild.cache = lib_plankton.cache.chest.implementation( + lib_plankton.cache.chest.make( + { + "chest": lib_plankton.storage.memory.implementation_chest({}), + } + ) + ); + await _zeitbild.cache.init(); // exec if (args["help"]) { diff --git a/source/repositories/calendar.ts b/source/repositories/calendar.ts index 30c5beb..abfea1c 100644 --- a/source/repositories/calendar.ts +++ b/source/repositories/calendar.ts @@ -251,6 +251,7 @@ namespace _zeitbild.repository.calendar {"level": access_attributed_row["level"]} ); } + await _zeitbild.cache.clear(); return Promise.resolve<_zeitbild.type_calendar_id>(calendar_id); } @@ -312,6 +313,7 @@ namespace _zeitbild.repository.calendar ); } } + await _zeitbild.cache.clear(); return Promise.resolve(undefined); } @@ -323,6 +325,7 @@ namespace _zeitbild.repository.calendar calendar_id : _zeitbild.type_calendar_id ) : Promise { + await _zeitbild.cache.clear(); const core_store = get_core_store(); const access_attributed_chest = get_access_attributed_chest(); // attributed access @@ -371,70 +374,77 @@ namespace _zeitbild.repository.calendar > > { - return ( - lib_plankton.file.read("sql/calendar_overview.sql") - .then( - (template) => _zeitbild.database.get_implementation().query_free_get( - { - "template": template, - "arguments": { - "user_id": user_id, + return lib_plankton.cache.get_complex>( + _zeitbild.cache, + "calendar_overview", + { + "user_id": user_id, + }, + () => ( + lib_plankton.file.read("sql/calendar_overview.sql") + .then( + (template) => _zeitbild.database.get_implementation().query_free_get( + { + "template": template, + "arguments": { + "user_id": user_id, + } } - } + ) ) - ) - .then( - (rows) => Promise.resolve( - lib_plankton.call.convey( - rows, - [ - (x : Array>) => x.map( - (row : Record) => ({ - "id": row["id"], - "name": row["name"], - /** - * @todo unite with _zeitbild.service.calendar.get_access_level - */ - "access_level": decode_access_level( - Math.max( - (row["access_public"] ? 1 : 0), - ( - (user_id === null) - ? - 0 - : - (row["access_level_attributed"] ?? row["access_level_default"]) + .then( + (rows) => Promise.resolve( + lib_plankton.call.convey( + rows, + [ + (x : Array>) => x.map( + (row : Record) => ({ + "id": row["id"], + "name": row["name"], + /** + * @todo unite with _zeitbild.service.calendar.get_access_level + */ + "access_level": decode_access_level( + Math.max( + (row["access_public"] ? 1 : 0), + ( + (user_id === null) + ? + 0 + : + (row["access_level_attributed"] ?? row["access_level_default"]) + ) ) + ), + }) + ), + (x : Array) => x.filter( + (row) => ( + ! _zeitbild.value_object.access_level.order( + row.access_level, + _zeitbild.enum_access_level.none ) - ), - }) - ), - (x : Array) => x.filter( - (row) => ( - ! _zeitbild.value_object.access_level.order( - row.access_level, - _zeitbild.enum_access_level.none ) - ) - ), - (x : Array) => lib_plankton.list.sorted( - x, - { - "compare_element": lib_plankton.order.order_lexicographic_pair_wrapped( - row => row.access_level, - row => row.id, - { - "order_first": _zeitbild.value_object.access_level.order, - "order_second": (a, b) => (a <= b) - } - ), - } - ), - ] + ), + (x : Array) => lib_plankton.list.sorted( + x, + { + "compare_element": lib_plankton.order.order_lexicographic_pair_wrapped( + row => row.access_level, + row => row.id, + { + "order_first": (a, b) => _zeitbild.value_object.access_level.order(b, a), + "order_second": (a, b) => (a <= b) + } + ), + } + ), + ] + ) ) ) ) - ) + ); } } diff --git a/source/repositories/resource.ts b/source/repositories/resource.ts index ad68e7f..7b7ffe8 100644 --- a/source/repositories/resource.ts +++ b/source/repositories/resource.ts @@ -398,6 +398,7 @@ namespace _zeitbild.repository.resource "sub_id": local_resource_id, } ); + await _zeitbild.cache.clear(); return Promise.resolve<_zeitbild.type_resource_id>(resource_id); break; } @@ -414,6 +415,7 @@ namespace _zeitbild.repository.resource "sub_id": caldav_resource_id, } ); + await _zeitbild.cache.clear(); return Promise.resolve<_zeitbild.type_resource_id>(resource_id); break; } @@ -493,6 +495,7 @@ namespace _zeitbild.repository.resource "read_only": resource_object.data.read_only, } ); + await _zeitbild.cache.clear(); break; } default: { @@ -546,7 +549,7 @@ namespace _zeitbild.repository.resource throw (new Error("not a local resource")); } else { - return get_local_resource_event_store().create( + const local_resource_event_id: _zeitbild.type_local_resource_event_id = await get_local_resource_event_store().create( encode_local_resource_event( { "local_resource_id": dataset_core["sub_id"], @@ -554,6 +557,8 @@ namespace _zeitbild.repository.resource } ) ); + await _zeitbild.cache.clear(); + return Promise.resolve(local_resource_event_id); } } @@ -571,7 +576,7 @@ namespace _zeitbild.repository.resource throw (new Error("not a local resource")); } else { - return get_local_resource_event_store().update( + await get_local_resource_event_store().update( event_id, encode_local_resource_event( { @@ -580,6 +585,8 @@ namespace _zeitbild.repository.resource } ) ); + await _zeitbild.cache.clear(); + return Promise.resolve(undefined); } } @@ -591,6 +598,7 @@ namespace _zeitbild.repository.resource local_resource_event_id : _zeitbild.type_local_resource_event_id ) : Promise { + await _zeitbild.cache.clear(); const dataset_core : Record = await get_resource_core_store().read(resource_id); if (! (dataset_core.kind === "local")) { throw (new Error("not a local resource")); diff --git a/source/services/calendar.ts b/source/services/calendar.ts index 377c3a8..b292755 100644 --- a/source/services/calendar.ts +++ b/source/services/calendar.ts @@ -425,6 +425,19 @@ namespace _zeitbild.service.calendar } + /** + */ + type type_gather_events_result = Array< + { + calendar_id : _zeitbild.type_calendar_id; + calendar_name : string; + access_level : _zeitbild.enum_access_level; + event_id : (null | _zeitbild.type_local_resource_event_id); + event_object : _zeitbild.type_event_object; + } + >; + + /** */ export async function gather_events( @@ -432,17 +445,7 @@ namespace _zeitbild.service.calendar from_pit : lib_plankton.pit.type_pit, to_pit : lib_plankton.pit.type_pit, user_id : (null | _zeitbild.type_user_id) - ) : Promise< - Array< - { - calendar_id : _zeitbild.type_calendar_id; - calendar_name : string; - access_level : _zeitbild.enum_access_level; - event_id : (null | _zeitbild.type_local_resource_event_id); - event_object : _zeitbild.type_event_object; - } - > - > + ) : Promise { const calendar_ids_allowed : Array<_zeitbild.type_calendar_id> = ( (await overview(user_id)) @@ -464,48 +467,58 @@ namespace _zeitbild.service.calendar ) ); calendar_ids.sort(); - return ( - Promise.all( - calendar_ids - .map( - async (calendar_id) => { - const calendar_object : _zeitbild.type_calendar_object = await _zeitbild.repository.calendar.read( - calendar_id - ); - const access_level : _zeitbild.enum_access_level = get_access_level( - calendar_object, - user_id - ); - const events : Array< - { - id : (null | _zeitbild.type_local_resource_event_id); - object : _zeitbild.type_event_object; - } - > = await get_events( - calendar_id, - from_pit, - to_pit, - user_id - ); - return Promise.resolve( - events - .map( - (event_entry) => ({ - "calendar_id": calendar_id, - "calendar_name": calendar_object.name, - "access_level": access_level, - "event_id": event_entry.id, - "event_object": event_entry.object, - }) - ) - ); - } + return lib_plankton.cache.get_complex( + _zeitbild.cache, + "gather_events", + { + "user_id": user_id, + "from_pit": from_pit, + "to_pit": to_pit, + "calendar_ids": calendar_ids, + }, + () => ( + Promise.all( + calendar_ids + .map( + async (calendar_id) => { + const calendar_object : _zeitbild.type_calendar_object = await _zeitbild.repository.calendar.read( + calendar_id + ); + const access_level : _zeitbild.enum_access_level = get_access_level( + calendar_object, + user_id + ); + const events : Array< + { + id : (null | _zeitbild.type_local_resource_event_id); + object : _zeitbild.type_event_object; + } + > = await get_events( + calendar_id, + from_pit, + to_pit, + user_id + ); + return Promise.resolve( + events + .map( + (event_entry) => ({ + "calendar_id": calendar_id, + "calendar_name": calendar_object.name, + "access_level": access_level, + "event_id": event_entry.id, + "event_object": event_entry.object, + }) + ) + ); + } + ) ) - ) - .then( - (sub_results) => sub_results.reduce( - (x, y) => x.concat(y), - [] + .then( + (sub_results) => sub_results.reduce( + (x, y) => x.concat(y), + [] + ) ) ) ); diff --git a/tools/makefile b/tools/makefile index 5112546..1ce8c12 100644 --- a/tools/makefile +++ b/tools/makefile @@ -35,6 +35,7 @@ ${dir_temp}/conf.ts: \ ${dir_temp}/zeitbild-unlinked.js: \ ${dir_lib}/plankton/plankton.d.ts \ + ${dir_source}/base.ts \ ${dir_source}/helpers.ts \ ${dir_source}/conf.ts \ ${dir_source}/database.ts \ diff --git a/tools/update-plankton b/tools/update-plankton index 5f646fd..beecb08 100755 --- a/tools/update-plankton +++ b/tools/update-plankton @@ -10,6 +10,7 @@ modules="${modules} call" modules="${modules} log" modules="${modules} conf" modules="${modules} storage" +modules="${modules} cache" modules="${modules} database" modules="${modules} session" modules="${modules} file" From 37ac9477dd9184db1162cf281cbb622eca4f3376 Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Fri, 11 Oct 2024 07:04:34 +0200 Subject: [PATCH 4/7] [int] --- tools/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makefile b/tools/makefile index 1ce8c12..ef5b65b 100644 --- a/tools/makefile +++ b/tools/makefile @@ -35,8 +35,8 @@ ${dir_temp}/conf.ts: \ ${dir_temp}/zeitbild-unlinked.js: \ ${dir_lib}/plankton/plankton.d.ts \ - ${dir_source}/base.ts \ ${dir_source}/helpers.ts \ + ${dir_source}/base.ts \ ${dir_source}/conf.ts \ ${dir_source}/database.ts \ ${dir_source}/auth.ts \ From 014c8f8f4beac582e6a0bf5c3e59e5574bddc28f Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Sat, 12 Oct 2024 12:03:45 +0200 Subject: [PATCH 5/7] [add] license --- license.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 license.txt diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/license.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From cd57732fd890e8e21497a245778765b4148e5434 Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Sat, 12 Oct 2024 12:03:45 +0200 Subject: [PATCH 6/7] [add] license --- license.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 license.txt diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/license.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From d46c48e326b561c7530b22d04ba947ae4c006e21 Mon Sep 17 00:00:00 2001 From: Fenris Wolf Date: Mon, 14 Oct 2024 19:06:33 +0200 Subject: [PATCH 7/7] =?UTF-8?q?[mod]=20datenmodell:link=20zu=20local=5Fres?= =?UTF-8?q?ource=5Fevent=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/api/actions/calendar_event_add.ts | 4 ++++ source/api/actions/calendar_event_change.ts | 4 ++++ source/api/actions/calendar_event_get.ts | 4 ++++ source/api/actions/events.ts | 4 ++++ source/database.ts | 2 +- source/repositories/resource.ts | 2 ++ source/services/calendar.ts | 7 +++++++ source/types.ts | 5 +++++ 8 files changed, 31 insertions(+), 1 deletion(-) diff --git a/source/api/actions/calendar_event_add.ts b/source/api/actions/calendar_event_add.ts index 434d062..df4c00e 100644 --- a/source/api/actions/calendar_event_add.ts +++ b/source/api/actions/calendar_event_add.ts @@ -42,6 +42,10 @@ namespace _zeitbild.api "type": "string", "nullable": true, }, + "link": { + "type": "string", + "nullable": true, + }, "description": { "type": "string", "nullable": true, diff --git a/source/api/actions/calendar_event_change.ts b/source/api/actions/calendar_event_change.ts index 4529021..42ec2d3 100644 --- a/source/api/actions/calendar_event_change.ts +++ b/source/api/actions/calendar_event_change.ts @@ -42,6 +42,10 @@ namespace _zeitbild.api "type": "string", "nullable": true, }, + "link": { + "type": "string", + "nullable": true, + }, "description": { "type": "string", "nullable": true, diff --git a/source/api/actions/calendar_event_get.ts b/source/api/actions/calendar_event_get.ts index 0cfbe94..34427a7 100644 --- a/source/api/actions/calendar_event_get.ts +++ b/source/api/actions/calendar_event_get.ts @@ -42,6 +42,10 @@ namespace _zeitbild.api "type": "string", "nullable": true, }, + "link": { + "type": "string", + "nullable": true, + }, "description": { "type": "string", "nullable": true, diff --git a/source/api/actions/events.ts b/source/api/actions/events.ts index 5e9ec64..49130b6 100644 --- a/source/api/actions/events.ts +++ b/source/api/actions/events.ts @@ -101,6 +101,10 @@ namespace _zeitbild.api "type": "string", "nullable": true, }, + "link": { + "type": "string", + "nullable": true, + }, "description": { "type": "string", "nullable": true, diff --git a/source/database.ts b/source/database.ts index 020d70d..057d925 100644 --- a/source/database.ts +++ b/source/database.ts @@ -5,7 +5,7 @@ namespace _zeitbild.database /** */ const _compatible_revisions : Array = [ - "r2", + "r3", ]; diff --git a/source/repositories/resource.ts b/source/repositories/resource.ts index 7b7ffe8..7a1b871 100644 --- a/source/repositories/resource.ts +++ b/source/repositories/resource.ts @@ -226,6 +226,7 @@ namespace _zeitbild.repository.resource encode_datetime(stuff.event.end) ), "location": stuff.event.location, + "link": stuff.event.link, "description": stuff.event.description, } } @@ -280,6 +281,7 @@ namespace _zeitbild.repository.resource decode_datetime(row["end"]) ), "location": row["location"], + "link": row["link"], "description": row["description"], } }; diff --git a/source/services/calendar.ts b/source/services/calendar.ts index b292755..d661e13 100644 --- a/source/services/calendar.ts +++ b/source/services/calendar.ts @@ -382,6 +382,13 @@ namespace _zeitbild.service.calendar : null ), + "link": ( + (vevent.url !== undefined) + ? + vevent.url + : + null + ), "description": ( (vevent.description !== undefined) ? diff --git a/source/types.ts b/source/types.ts index 91baee5..f827584 100644 --- a/source/types.ts +++ b/source/types.ts @@ -46,6 +46,11 @@ namespace _zeitbild | string ); + link : ( + null + | + string + ); description : ( null |