Two conflicts, both in the calendar rich-image preview URL and both the same
shape: main fixed the default host while this branch renamed the brand type.
Took main's fix and this branch's package.
- shortcuts/calendar/description_rich_images.go: host stays the feishu.cn value
#2079 corrected it to, with the brandpkg.Brand signature.
- shortcuts/calendar/description_rich_images_test.go: the expected host fragment
follows the same fix; the table already carried brandpkg.Brand from the
automatic merge, so core.Brand* would not have compiled.
1ba4d1fd77